mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 06:06:43 +00:00
Merge pull request #5770 from heitbaum/openssl
openssl: update to 3.0.1
This commit is contained in:
commit
757c2e0ce9
@ -5,4 +5,4 @@
|
||||
OS_VERSION="11.0"
|
||||
|
||||
# ADDON_VERSION: Addon version
|
||||
ADDON_VERSION="10.80.2"
|
||||
ADDON_VERSION="10.80.3"
|
||||
|
@ -14,6 +14,15 @@ PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc
|
||||
PKG_DEPENDS_INIT="toolchain"
|
||||
PKG_LONGDESC="This package contains the GNU Compiler Collection."
|
||||
|
||||
case ${TARGET_ARCH} in
|
||||
arm|riscv64)
|
||||
OPTS_LIBATOMIC="--enable-libatomic"
|
||||
;;
|
||||
*)
|
||||
OPTS_LIBATOMIC="--disable-libatomic"
|
||||
;;
|
||||
esac
|
||||
|
||||
GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \
|
||||
--with-sysroot=${SYSROOT_PREFIX} \
|
||||
--with-gmp=${TOOLCHAIN} \
|
||||
@ -35,7 +44,6 @@ GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \
|
||||
--without-cloog \
|
||||
--disable-libada \
|
||||
--disable-libmudflap \
|
||||
--disable-libatomic \
|
||||
--disable-libitm \
|
||||
--disable-libquadmath \
|
||||
--disable-libgomp \
|
||||
@ -47,6 +55,7 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
|
||||
--enable-languages=c \
|
||||
--disable-libsanitizer \
|
||||
--enable-cloog-backend=isl \
|
||||
--disable-libatomic \
|
||||
--disable-shared \
|
||||
--disable-threads \
|
||||
--without-headers \
|
||||
@ -56,6 +65,7 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \
|
||||
--enable-languages=c,c++ \
|
||||
${OPTS_LIBATOMIC} \
|
||||
--enable-decimal-float \
|
||||
--enable-tls \
|
||||
--enable-shared \
|
||||
@ -132,6 +142,9 @@ makeinstall_target() {
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
|
||||
cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${INSTALL}/usr/lib
|
||||
if [ "${OPTS_LIBATOMIC}" = "--enable-libatomic" ]; then
|
||||
cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libatomic/.libs/libatomic.so* ${INSTALL}/usr/lib
|
||||
fi
|
||||
}
|
||||
|
||||
configure_init() {
|
||||
|
@ -3,9 +3,9 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="openssl"
|
||||
PKG_VERSION="1.1.1m"
|
||||
PKG_SHA256="f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_VERSION="3.0.1"
|
||||
PKG_SHA256="c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1"
|
||||
PKG_LICENSE="Apache-2.0"
|
||||
PKG_SITE="https://www.openssl.org"
|
||||
PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_HOST="ccache:host"
|
||||
|
10
packages/tools/crust/patches/fix-stack.patch
Normal file
10
packages/tools/crust/patches/fix-stack.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- a/Makefile 2021-12-15 20:13:00.978559336 +0000
|
||||
+++ b/Makefile 2021-12-15 20:18:06.344712669 +0000
|
||||
@@ -25,6 +25,7 @@
|
||||
-fdata-sections \
|
||||
-ffunction-sections \
|
||||
-fno-builtin \
|
||||
+ -fno-stack-protector \
|
||||
-fno-common \
|
||||
-fvar-tracking-assignments \
|
||||
-g$(if $(CONFIG_DEBUG_INFO),gdb,0) \
|
Loading…
x
Reference in New Issue
Block a user