Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/
Date: Tue, 19 Feb 2019 14:49:27
Message-Id: 1550587749.b091d65077af3b9bb7e286f741f7e1e684fe5eb9.grobian@gentoo
1 commit: b091d65077af3b9bb7e286f741f7e1e684fe5eb9
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 19 14:48:52 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 19 14:49:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b091d650
7
8 dev-lang/perl: fix linking on Solaris, bug #677676
9
10 Closes: https://bugs.gentoo.org/677676
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 dev-lang/perl/perl-5.28.0.ebuild | 7 +++++--
15 dev-lang/perl/perl-5.28.9999.ebuild | 7 +++++--
16 2 files changed, 10 insertions(+), 4 deletions(-)
17
18 diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild
19 index bacc75e30d8..71fc2b82b39 100644
20 --- a/dev-lang/perl/perl-5.28.0.ebuild
21 +++ b/dev-lang/perl/perl-5.28.0.ebuild
22 @@ -307,8 +307,6 @@ src_prepare() {
23 # do NOT mess with nsl, on Solaris this is always necessary,
24 # when -lsocket is used e.g. to get h_errno
25 sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
26 - # and set a soname
27 - sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die
28 fi
29
30 einfo "Applying patches from ${PATCH_BASE} ..."
31 @@ -333,6 +331,11 @@ src_prepare() {
32 sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
33 fi
34
35 + if [[ ${CHOST} == *-solaris* ]] ; then
36 + # set a soname, fix linking against just built libperl
37 + sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
38 + fi
39 +
40 default
41 }
42
43
44 diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
45 index bacc75e30d8..71fc2b82b39 100644
46 --- a/dev-lang/perl/perl-5.28.9999.ebuild
47 +++ b/dev-lang/perl/perl-5.28.9999.ebuild
48 @@ -307,8 +307,6 @@ src_prepare() {
49 # do NOT mess with nsl, on Solaris this is always necessary,
50 # when -lsocket is used e.g. to get h_errno
51 sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
52 - # and set a soname
53 - sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die
54 fi
55
56 einfo "Applying patches from ${PATCH_BASE} ..."
57 @@ -333,6 +331,11 @@ src_prepare() {
58 sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
59 fi
60
61 + if [[ ${CHOST} == *-solaris* ]] ; then
62 + # set a soname, fix linking against just built libperl
63 + sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
64 + fi
65 +
66 default
67 }