From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A68A0158086 for ; Wed, 15 Dec 2021 04:15:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B81C32BC010; Wed, 15 Dec 2021 04:15:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 938DA2BC010 for ; Wed, 15 Dec 2021 04:15:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FBCE340FFC for ; Wed, 15 Dec 2021 04:15:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE97D132 for ; Wed, 15 Dec 2021 04:15:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639541694.79fc3e6900f1fc8f4dc49d13afa1e7fbf5e1112b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.1.1m.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 79fc3e6900f1fc8f4dc49d13afa1e7fbf5e1112b X-VCS-Branch: master Date: Wed, 15 Dec 2021 04:15:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 75f7d41a-096b-4ddc-a16a-2311d7bc2db3 X-Archives-Hash: c044e1f60cb73a8c38ef78712c93bbc5 commit: 79fc3e6900f1fc8f4dc49d13afa1e7fbf5e1112b Author: Sam James gentoo org> AuthorDate: Wed Dec 15 04:10:41 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 15 04:14:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fc3e69 dev-libs/openssl: pull in prefix changes for 1.1.1m Not doing 3.x for now as I imagine that'll need more testing on Prefix anyway. Signed-off-by: Sam James gentoo.org> dev-libs/openssl/openssl-1.1.1m.ebuild | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-libs/openssl/openssl-1.1.1m.ebuild b/dev-libs/openssl/openssl-1.1.1m.ebuild index 3b4a73bfd284..7e5a73877b48 100644 --- a/dev-libs/openssl/openssl-1.1.1m.ebuild +++ b/dev-libs/openssl/openssl-1.1.1m.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" LICENSE="openssl" SLOT="0/1.1" # .so version of libssl/libcrypto [[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="+asm elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla" RESTRICT="!test? ( test )" @@ -27,7 +27,7 @@ BDEPEND=" test? ( sys-apps/diffutils sys-devel/bc - sys-process/procps + kernel_linux? ( sys-process/procps ) )" PDEPEND="app-misc/ca-certificates" @@ -117,6 +117,21 @@ src_prepare() { -e '/^$config{dirs}/s@ "test",@@' \ -i Configure || die fi + + if use prefix && [[ ${CHOST} == *-solaris* ]] ; then + # use GNU ld full option, not to confuse it on Solaris + sed -i \ + -e 's/-Wl,-M,/-Wl,--version-script=/' \ + -e 's/-Wl,-h,/-Wl,--soname=/' \ + Configurations/10-main.conf || die + + # fix building on Solaris 10 + # https://github.com/openssl/openssl/issues/6333 + sed -i \ + -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \ + Configurations/10-main.conf || die + fi + # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die ./config --test-sanity || die "I AM NOT SANE"