diff options
| author | brnrd <brnrd@FreeBSD.org> | 2018-10-28 22:52:34 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2018-10-28 22:52:34 +0800 |
| commit | f2bc0dd0fea0c9937c15acc70d7e6a7b6f40765f (patch) | |
| tree | 9d81deee456715aee925054f7fe4e3e38969e3d7 | |
| parent | a6dabb3ec30497e8c8ba46a1291e09ab63be2858 (diff) | |
| download | freebsd-ports-gnome-f2bc0dd0fea0c9937c15acc70d7e6a7b6f40765f.tar.gz freebsd-ports-gnome-f2bc0dd0fea0c9937c15acc70d7e6a7b6f40765f.tar.zst freebsd-ports-gnome-f2bc0dd0fea0c9937c15acc70d7e6a7b6f40765f.zip | |
security/openssl-devel: Fix SHARED option
- Fix linking with lld on i386
- Fix ordering
PR: 231333
Reported by: lev
| -rw-r--r-- | security/openssl-devel/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 66ccb8277ba5..de5769fc6723 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= https://www.openssl.org/source/ \ PKGNAMESUFFIX= -devel MAINTAINER= brnrd@FreeBSD.org -COMMENT= SSL and crypto library (1.1.x) +COMMENT= SSL and crypto library (1.1.0) LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE @@ -28,6 +28,12 @@ CONFIGURE_ENV= PERL="${PERL}" CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} \ --prefix=${PREFIX} -v +USES= cpe perl5 +USE_PERL5= build +MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive +MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= +TEST_TARGET= test + OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS OPTIONS_GROUP_CIPHERS= IDEA JPAKE RC2 RC4 RC5 OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160 @@ -43,6 +49,7 @@ OPTIONS_GROUP_OPTIMIZE+= EC OPTIONS_GROUP_OPTIMIZE+= EC .endif OPTIONS_DEFAULT= ASM ASYNC DH EC MAN3 MD4 RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 +OPTIONS_SUB= yes ASM_DESC= Assembler code ASYNC_DESC= Asynchronous mode @@ -74,14 +81,6 @@ TLS1_DESC= TLSv1.0 support TLS1_1_DESC= TLSv1.1 support (disables TLSv1.0 as well) 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} @@ -89,7 +88,7 @@ ${_option:tu}_CONFIGURE_ON= enable-${_option} # Upstream default enabled options .for _option in asm async dh idea md4 mdc2 md_ghost94 nextprotoneg rfc3779 \ - rmd160 sse2 threads tls1 tls1_1 zlib + rmd160 shared sse2 threads tls1 tls1_1 zlib ${_option:tu}_CONFIGURE_OFF= no-${_option} .endfor @@ -133,6 +132,7 @@ post-configure: ${REINPLACE_CMD} \ -e 's|SHLIB_VERSION_NUMBER "1.1"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \ ${WRKSRC}/include/openssl/opensslv.h + ${REINPLACE_CMD} -e 's|\^GNU ld|GNU|' ${WRKSRC}/Makefile.shared post-install-SHARED-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.${OPENSSL_SHLIBVER} \ |