aboutsummaryrefslogtreecommitdiff
path: root/security/openssl-devel/Makefile
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2016-10-01 17:37:07 +0000
committerBernard Spil <brnrd@FreeBSD.org>2016-10-01 17:37:07 +0000
commitdbe3dbb507e6a2068dee12ee7844edc3797e7dea (patch)
tree7a3dad8fe3a96a0f20bd0e0fc9b5cb83277c26a4 /security/openssl-devel/Makefile
parent0bfba8b5e3d01487205cf7aaa50273310affd9bb (diff)
downloadports-2016Q3.tar.gz
ports-2016Q3.zip
security/openssl-devel: Fix build in 2016Q3 branch2016Q3
Approved by: fixit blanket Approved by: ports-secteam (delphij) Security: 43eaa656-80bc-11e6-bf52-b499baebfeaf Security: 91a337d8-83ed-11e6-bf52-b499baebfeaf
Notes
Notes: svn path=/branches/2016Q3/; revision=423083
Diffstat (limited to 'security/openssl-devel/Makefile')
-rw-r--r--security/openssl-devel/Makefile97
1 files changed, 48 insertions, 49 deletions
diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
index 533c4ba59cfd..d306f5fcd369 100644
--- a/security/openssl-devel/Makefile
+++ b/security/openssl-devel/Makefile
@@ -5,7 +5,6 @@ PORTNAME= openssl
PORTVERSION= 1.1.0b
CATEGORIES= security devel
MASTER_SITES= https://www.openssl.org/source/ \
- ftp://ftp.openssl.org/source/ \
ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
PKGNAMESUFFIX= -devel
@@ -15,28 +14,38 @@ COMMENT= SSL and crypto library (1.1.x)
LICENSE= OpenSSL
LICENSE_FILE= ${WRKSRC}/LICENSE
-CONFLICTS= libressl-[0-9]* libressl-devel-[0-9]* openssl-[0-9]*
+CPE_VERSION= ${PORTVERSION}${DISTVERSIONSUFFIX}
+CONFLICTS= libressl-[0-9]* \
+ libressl-devel-[0-9]* \
+ openssl-[0-9]*
+
+HAS_CONFIGURE= yes
+CONFIGURE_SCRIPT= config
+CONFIGURE_ENV= PERL="${PERL}"
+CONFIGURE_ARGS= --openssldir=${OPENSSLDIR}
OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS
OPTIONS_GROUP_CIPHERS= IDEA JPAKE RC2 RC4 RC5
OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160
-OPTIONS_GROUP_OPTIMIZE= ASM SSE2
+OPTIONS_GROUP_OPTIMIZE= ASM EC SSE2 THREADS
+OPTIONS_DEFINE_i386= I386
OPTIONS_GROUP_PROTOCOLS= NEXTPROTONEG SCTP SSL3
-OPTIONS_DEFINE= SHARED THREADS ZLIB RFC3779 MAN3
-OPTIONS_DEFAULT= ASM MAN3 RMD160 SCTP SHARED SSE2 THREADS
-.for a in amd64 ia64
-OPTIONS_GROUP_OPTIMIZE_${a}= EC
-OPTIONS_DEFAULT_${a}= EC
-.endfor
-TARGET_ARCH?= ${MACHINE_ARCH}
-.if ${TARGET_ARCH} == "mips64el"
-OPTIONS_GROUP_OPTIMIZE+= EC
+OPTIONS_DEFINE= MAN3 RFC3779 SHARED THREADS ZLIB
+
+OPTIONS_DEFINE_amd64= EC
+OPTIONS_DEFAULT_amd64= EC
+OPTIONS_DEFINE_ia64= EC
+OPTIONS_DEFAULT_ia64= EC
+.if ${MACHINE_ARCH} == "mips64el"
+OPTIONS_DEFINE+= EC
OPTIONS_DEFAULT+= EC
.endif
+OPTIONS_DEFAULT= ASM MAN3 MD4 RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS
+
ASM_DESC= Assembler code
CIPHERS_DESC= Cipher Suite Support
-EC_DESC= NIST elliptic curves
+EC_DESC= Optimize NIST elliptic curves
HASHES_DESC= Hash Function Support
I386_DESC= i386 (instead of i486+)
IDEA_DESC= IDEA
@@ -48,7 +57,7 @@ MDC2_DESC= MDC-2
MD_GHOST94_DESC= GHOST94 (obscure)
NEXTPROTONEG_DESC= Next Protocol Negotiation (SPDY)
OPTIMIZE_DESC= Optimizations
-PROTOCOLS_DESC= Protocols Support
+PROTOCOLS_DESC= Protocol Support
RC2_DESC= RC2 (unsafe)
RC4_DESC= RC4 (unsafe)
RC5_DESC= RC5 (patented)
@@ -57,38 +66,32 @@ RFC3779_DESC= RFC3779 support (BGP)
SCTP_DESC= SCTP (Stream Control Transmission)
SHARED_DESC= Build shared libraries
SSE2_DESC= Runtime SSE2 detection
-SSL3_DESC= SSLv3
+SSL3_DESC= SSLv3 (unsafe)
ZLIB_DESC= zlib compression support
-NO_OPTIONS_SORT=yes
OPTIONS_SUB= yes
-HAS_CONFIGURE= yes
-CONFIGURE_SCRIPT= config
-
-NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch
-NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch
-USES= cpe localbase perl5
+USES= cpe perl5
USE_PERL5= build
MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
-SUB_FILES= pkg-message
TEST_TARGET= test
-CPE_VERSION= ${DISTVERSION}
-
-.for _option in asm idea md2 md4 mdc2 md_ghost94 nextprotoneg rc5 rfc3779 rmd160 sctp sse2 ssl3 threads
+# Upstream default disabled options
+.for _option in md2 rc5 sctp ssl3 zlib
${_option:tu}_CONFIGURE_ON= enable-${_option}
+.endfor
+
+# Upstream default enabled options
+.for _option in asm idea md4 mdc2 md_ghost94 nextprotoneg rfc3779 rmd160 sse2 threads zlib
${_option:tu}_CONFIGURE_OFF= no-${_option}
.endfor
-ASM_NOT_FOR_ARCHS= sparc6
+
EC_CONFIGURE_ON= enable-ec_nistp_64_gcc_128
-EC_CONFIGURE_OFF= no-ec_nistp_64_gcc_128
-SHARED_CONFIGURE_ON= shared
+I386_CONFIGURE_ON= 386
SHARED_MAKE_ENV= SHLIBVER=${OPENSSL_SHLIBVER}
SHARED_PLIST_SUB= SHLIBVER=${OPENSSL_SHLIBVER}
-SHARED_USE_LDCONFIG= yes
-SSL3_CONFIGURE_OFF= no-ssl3-method
+SHARED_USE= ldconfig=yes
SSL3_CONFIGURE_ON+= enable-ssl3-method
ZLIB_CONFIGURE_ON= zlib-dynamic
@@ -99,35 +102,31 @@ IGNORE= the OpenSSL port can not be installed over the base version
OPENSSLDIR?= ${PREFIX}/openssl
PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
-CONFIGURE_ARGS+= --openssldir=${OPENSSLDIR}
OPENSSL_BASE_SONAME!= readlink ${DESTDIR}/usr/lib/libcrypto.so || true
OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E}
OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H}
-OPENSSL_SHLIBVER?= 9
-.if ${ARCH} == "i386"
-OPTIONS_GROUP_OPTIMIZE+= I386
+.include "version.mk"
+
+.if ${PORT_OPTIONS:MASM}
+BROKEN_sparc64= option ASM generates illegal instructions
.endif
-I386_CONFIGURE_ON= 386
post-patch:
- ${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \
- ${WRKSRC}/crypto/des/Makefile.in
- ${REINPLACE_CMD} -e 's|ERR_R_MALLOC_ERROR|ERR_R_MALLOC_FAILURE|' \
- ${WRKSRC}/crypto/bio/bss_dgram.c
+ ${REINPLACE_CMD} \
+ -e 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \
+ -e 's| install_html_docs$$||' \
+ -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
+ ${WRKSRC}/Configurations/unix-Makefile.tmpl
post-configure:
${REINPLACE_CMD} \
- -e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \
- -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \
- -e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|$(OPENSSL_SHLIBVER)|g' \
- -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
- -e 's| install_html_docs$$||' \
+ -e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|${OPENSSL_SHLIBVER}|g' \
${WRKSRC}/Makefile
${REINPLACE_CMD} \
- -e 's|^LIBVERSION=$$|LIBVERSION=$(OPENSSL_SHLIBVER) |' \
- ${WRKSRC}/Makefile.shared
+ -e 's|SHLIB_VERSION_NUMBER "1.1"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \
+ ${WRKSRC}/include/openssl/opensslv.h
post-install-SHARED-on:
.for i in libcrypto libssl
@@ -135,8 +134,8 @@ post-install-SHARED-on:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$i.so.${OPENSSL_SHLIBVER}
${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so
.endfor
-.for i in capi dasync padlock
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines/${i}.so
+.for i in capi padlock
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines-1.1/${i}.so
.endfor
post-install-MAN3-off: