commit:     b091d65077af3b9bb7e286f741f7e1e684fe5eb9
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 19 14:48:52 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Feb 19 14:49:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b091d650

dev-lang/perl: fix linking on Solaris, bug #677676

Closes: https://bugs.gentoo.org/677676
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-lang/perl/perl-5.28.0.ebuild    | 7 +++++--
 dev-lang/perl/perl-5.28.9999.ebuild | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild
index bacc75e30d8..71fc2b82b39 100644
--- a/dev-lang/perl/perl-5.28.0.ebuild
+++ b/dev-lang/perl/perl-5.28.0.ebuild
@@ -307,8 +307,6 @@ src_prepare() {
                # do NOT mess with nsl, on Solaris this is always necessary,
                # when -lsocket is used e.g. to get h_errno
                sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" 
|| die
-               # and set a soname
-               sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die
        fi
 
        einfo "Applying patches from ${PATCH_BASE} ..."
@@ -333,6 +331,11 @@ src_prepare() {
                sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL 
|| die
        fi
 
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               # set a soname, fix linking against just built libperl
+               sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+       fi
+
        default
 }
 

diff --git a/dev-lang/perl/perl-5.28.9999.ebuild 
b/dev-lang/perl/perl-5.28.9999.ebuild
index bacc75e30d8..71fc2b82b39 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -307,8 +307,6 @@ src_prepare() {
                # do NOT mess with nsl, on Solaris this is always necessary,
                # when -lsocket is used e.g. to get h_errno
                sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" 
|| die
-               # and set a soname
-               sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die
        fi
 
        einfo "Applying patches from ${PATCH_BASE} ..."
@@ -333,6 +331,11 @@ src_prepare() {
                sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL 
|| die
        fi
 
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               # set a soname, fix linking against just built libperl
+               sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+       fi
+
        default
 }
 

Reply via email to