diff options
Diffstat (limited to 'package/openssl')
| -rw-r--r-- | package/openssl/Makefile | 29 | ||||
| -rw-r--r-- | package/openssl/patches/patch-Configurations_unix-Makefile_tmpl | 20 |
2 files changed, 9 insertions, 40 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 406a88681..c397e6dce 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 3.0.13 +PKG_VERSION:= 3.5.4 PKG_RELEASE:= 1 -PKG_HASH:= 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 +PKG_HASH:= 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto -PKG_URL:= https://www.openssl.org +PKG_URL:= https://openssl-library.org/ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib -PKG_SITES:= https://www.openssl.org/source/ +PKG_SITES:= https://github.com/openssl/openssl/releases/download/openssl-$(PKG_VERSION)/ PKG_LIBNAME:= libopenssl PKG_OPTS:= dev @@ -38,7 +38,7 @@ OPENSSL_OPTIONS:= shared zlib-dynamic endif OPENSSL_OPTIONS+= threads no-err no-tests no-fuzz-libfuzzer no-fuzz-afl -OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea +OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea no-docs HOST_STYLE:= manual CONFIG_STYLE:= manual @@ -62,27 +62,17 @@ CONFIG:= linux-x86_64 endif ifeq ($(ADK_TARGET_ARCH_AARCH64),y) CONFIG:= linux-aarch64 -endif - -ifneq (,$(filter CYGWIN%,${OS_FOR_BUILD})) -HOSTCONFIG:= Cygwin-x86_64 -endif -ifeq ($(OS_FOR_BUILD),Darwin) -HOSTCONFIG:= darwin64-x86_64-cc +OPENSSL_OPTIONS+= no-asm endif host-configure: -ifeq ($(HOSTCONFIG),) - (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl) -else - (cd $(WRKBUILD); ./Configure $(HOSTCONFIG) --prefix='$(STAGING_HOST_DIR)/usr') -endif + (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl no-docs no-tests) host-build: - (cd $(WRKBUILD); make) + (cd $(WRKBUILD); $(MAKE)) openssl-hostinstall: - (cd $(WRKBUILD); make install) + (cd $(WRKBUILD); $(MAKE) install) do-configure: (cd $(WRKBUILD); \ @@ -99,7 +89,6 @@ do-configure: -DOPENSSL_NO_ASYNC \ $(OPENSSL_OPTIONS) \ ); - #$(SED) "s:-O[0-9]:$(TARGET_CFLAGS) -fPIC:" $(WRKBUILD)/Makefile libopenssl-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib diff --git a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl b/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl deleted file mode 100644 index eb64f9a73..000000000 --- a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl +++ /dev/null @@ -1,20 +0,0 @@ ---- openssl-3.0.10.orig/Configurations/unix-Makefile.tmpl 2023-08-01 15:47:24.000000000 +0200 -+++ openssl-3.0.10/Configurations/unix-Makefile.tmpl 2023-08-12 19:44:43.932070216 +0200 -@@ -523,7 +523,7 @@ build_all_generated: $(GENERATED_MANDATO - @echo " then make will fail..." - @ : {- output_on() if $disabled{makedepend}; "" -} - --all: build_sw build_docs -+all: build_sw - - test: tests - {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests -@@ -546,7 +546,7 @@ list-tests: - @echo "Tests are not supported with your chosen Configure options" - @ : {- output_on() if !$disabled{tests}; "" -} - --install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} -+install: install_sw install_ssldirs {- $disabled{fips} ? "" : "install_fips" -} - - uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} - |