From owner-svn-ports-all@freebsd.org Fri Oct 5 09:17:02 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83C2210C7703; Fri, 5 Oct 2018 09:17:02 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28E847890F; Fri, 5 Oct 2018 09:17:02 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E197134B2; Fri, 5 Oct 2018 09:17:02 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w959H19a043230; Fri, 5 Oct 2018 09:17:01 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w959H1wM043229; Fri, 5 Oct 2018 09:17:01 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201810050917.w959H1wM043229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Fri, 5 Oct 2018 09:17:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481266 - head/security/openssl111 X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/security/openssl111 X-SVN-Commit-Revision: 481266 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2018 09:17:02 -0000 Author: brnrd Date: Fri Oct 5 09:17:01 2018 New Revision: 481266 URL: https://svnweb.freebsd.org/changeset/ports/481266 Log: security/openssl111: Fix linking with lld on i386 - Fix shared option - While here, fix ordering PR: 231459 Submitted by: Nathan Reported by: emaste Differential Revision: https://reviews.freebsd.org/D17362 Modified: head/security/openssl111/Makefile Modified: head/security/openssl111/Makefile ============================================================================== --- head/security/openssl111/Makefile Fri Oct 5 09:14:13 2018 (r481265) +++ head/security/openssl111/Makefile Fri Oct 5 09:17:01 2018 (r481266) @@ -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} \