Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/
Date: Tue, 17 Sep 2019 10:47:31
Message-Id: 1568717229.9db6729aa2bede4068553436de0fbc92aba595dc.grobian@gentoo
1 commit: 9db6729aa2bede4068553436de0fbc92aba595dc
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 17 10:47:09 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 17 10:47:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9db6729a
7
8 dev-libs/openssl: fix linking of 1.1.1d on Solaris 10
9
10 Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.17
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 dev-libs/openssl/openssl-1.1.1d.ebuild | 5 +++++
14 1 file changed, 5 insertions(+)
15
16 diff --git a/dev-libs/openssl/openssl-1.1.1d.ebuild b/dev-libs/openssl/openssl-1.1.1d.ebuild
17 index b79d7747ba..d018ce3d80 100644
18 --- a/dev-libs/openssl/openssl-1.1.1d.ebuild
19 +++ b/dev-libs/openssl/openssl-1.1.1d.ebuild
20 @@ -137,6 +137,11 @@ src_prepare() {
21 -e 's/-Wl,-M,/-Wl,--version-script=/' \
22 -e 's/-Wl,-h,/-Wl,--soname=/' \
23 Configurations/10-main.conf || die
24 + # fix building on Solaris 10
25 + # https://github.com/openssl/openssl/issues/6333
26 + sed -i \
27 + -e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
28 + Configurations/10-main.conf || die
29 # The config script does stupid stuff to prompt the user. Kill it.
30 sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
31 # The MS Azure build agent does set SYSTEM=build. Ignore such vars.