kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

security/openssl111: Fix linking with lld on i386

Browse source 
- Fix shared option
 - While here, fix ordering

PR:		231459
Submitted by:	Nathan <ndowens yahoo com>
Reported by:	emaste
Differential Revision:	https://reviews.freebsd.org/D17362
This commit is contained in:
Bernard Spil 2018-10-05 09:17:01 +00:00
parent c847d1218f
commit 0b7918965c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=481266
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
security/openssl111/Makefile
View file

@ -25,6 +25,16 @@ CONFIGURE_SCRIPT= config
CONFIGURE_ENV= PERL="${PERL}"
CONFIGURE_ARGS= --openssldir=${OPENSSLDIR}
USES= cpe perl5
USE_PERL5= build
TEST_TARGET= test
LDFLAGS_i386= -Wl,-znotext
#LDFLAGS= ${LDFLAGS_${ARCH}}
MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}"
MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS
OPTIONS_GROUP_CIPHERS= ARIA DES GOST IDEA SM2 SM3 SM4 RC2 RC4 RC5
OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160
@ -45,6 +55,8 @@ OPTIONS_GROUP_OPTIMIZE+= EC
OPTIONS_GROUP_OPTIMIZE+= EC
.endif
OPTIONS_SUB= yes
ARIA_DESC= ARIA (South Korean standard)
ASM_DESC= Assembler code
ASYNC_DESC= Asynchronous mode
@ -80,14 +92,6 @@ TLS1_1_DESC= TLSv1.1 (requires TLS1_2)
TLS1_2_DESC= TLSv1.2
ZLIB_DESC= zlib compression support
OPTIONS_SUB= yes
USES= cpe perl5
USE_PERL5= build
MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
TEST_TARGET= test
# Upstream default disabled options
.for _option in md2 rc5 sctp ssl3 zlib
${_option:tu}_CONFIGURE_ON= enable-${_option}
@ -95,7 +99,7 @@ ${_option:tu}_CONFIGURE_ON= enable-${_option}
# Upstream default enabled options
.for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg \
rfc3779 rmd160 sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2
rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2
${_option:tu}_CONFIGURE_OFF= no-${_option}
.endfor
@ -132,6 +136,7 @@ post-patch:
-e 's| install_html_docs$$||' \
-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
${WRKSRC}/Configurations/unix-Makefile.tmpl
${REINPLACE_CMD} -e 's|\^GNU ld|GNU|' ${WRKSRC}/Configurations/shared-info.pl
post-configure:
${REINPLACE_CMD} \