svn commit: r483302 - head/security/openssl-devel
Bernard Spil
brnrd at FreeBSD.org
Sun Oct 28 14:52:36 UTC 2018
Author: brnrd
Date: Sun Oct 28 14:52:34 2018
New Revision: 483302
URL: https://svnweb.freebsd.org/changeset/ports/483302
Log:
security/openssl-devel: Fix SHARED option
- Fix linking with lld on i386
- Fix ordering
PR: 231333
Reported by: lev
Modified:
head/security/openssl-devel/Makefile
Modified: head/security/openssl-devel/Makefile
==============================================================================
--- head/security/openssl-devel/Makefile Sun Oct 28 14:45:03 2018 (r483301)
+++ head/security/openssl-devel/Makefile Sun Oct 28 14:52:34 2018 (r483302)
@@ -9,7 +9,7 @@ MASTER_SITES= https://www.openssl.org/source/ \
PKGNAMESUFFIX= -devel
MAINTAINER= brnrd at 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} \
More information about the svn-ports-all
mailing list