@@ -5,9 +5,8 @@ $(package)_download_path=https://www.openssl.org/source/old/$($(package)_version
55$(package)_file_name =$(package ) -$($(package ) _version)$($(package ) _version_suffix) .tar.gz
66$(package)_sha256_hash =ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
77
8- # PATCHES (must use +=, not =)
8+ # PATCHES
99$(package)_patches += secure_getenv.patch
10- # $(package)_patches += domd_cc.patch
1110
1211define $(package)_set_vars
1312$(package ) _config_env=AR="$($(package ) _ar) " RANLIB="$($(package ) _ranlib) " CC="$($(package ) _cc) "
@@ -48,6 +47,7 @@ $(package)_config_opts+=no-whirlpool
4847$(package ) _config_opts+=no-zlib
4948$(package ) _config_opts+=no-zlib-dynamic
5049$(package ) _config_opts+=$($(package ) _cflags) $($(package ) _cppflags)
50+
5151$(package ) _config_opts_linux=-fPIC -Wa,--noexecstack
5252$(package ) _config_opts_x86_64_linux=linux-x86_64
5353$(package ) _config_opts_i686_linux=linux-generic32
@@ -56,26 +56,37 @@ $(package)_config_opts_aarch64_linux=linux-generic64
5656$(package ) _config_opts_mipsel_linux=linux-generic32
5757$(package ) _config_opts_mips_linux=linux-generic32
5858$(package ) _config_opts_powerpc_linux=linux-generic32
59+
5960$(package ) _config_opts_x86_64_darwin=darwin64-x86_64-cc
6061$(package ) _config_opts_x86_64_mingw32=mingw64
6162$(package ) _config_opts_i686_mingw32=mingw
6263endef
6364
65+
66+ # ======================
67+ # PREPROCESS
68+ # ======================
6469define $(package)_preprocess_cmds
6570 patch -p1 < $($(package ) _patch_dir) /secure_getenv.patch && \
6671 sed -i.old "/define DATE/d" util/mkbuildinf.pl && \
67- sed -i.old "s|engines apps test|engines|" Makefile.org && \
68- sed -i.old "s# ^CC=.*#CC=$($(package)_cc)#" Configure && \
69- \
70- echo "Patching util/domd to replace hardcoded clang..." && \
71- sed -i.old "s|\bclang\b|$($(package)_cc)|g" util/domd
72+ sed -i.old "s|engines apps test|engines|" Makefile.org
7273endef
7374
75+
76+ # ======================
77+ # CONFIGURE (REAL FIX HERE)
78+ # ======================
7479define $(package)_config_cmds
7580 ./Configure $($(package ) _config_opts) && \
81+ echo "Patching final util/domd to remove clang..." && \
82+ sed -i.bak 's/clang/cc/g' util/domd && \
7683 make depend
7784endef
7885
86+
87+ # ======================
88+ # BUILD/STAGE
89+ # ======================
7990define $(package)_build_cmds
8091 $(MAKE ) -j1 build_libs libcrypto.pc libssl.pc openssl.pc
8192endef
0 commit comments