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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37A40138334 for ; Tue, 19 Feb 2019 14:49:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F11B4E082D; Tue, 19 Feb 2019 14:49:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C696CE082D for ; Tue, 19 Feb 2019 14:49:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95C22335CCD for ; Tue, 19 Feb 2019 14:49:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3DD5B520 for ; Tue, 19 Feb 2019 14:49:22 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1550587749.b091d65077af3b9bb7e286f741f7e1e684fe5eb9.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/perl-5.28.0.ebuild dev-lang/perl/perl-5.28.9999.ebuild X-VCS-Directories: dev-lang/perl/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: b091d65077af3b9bb7e286f741f7e1e684fe5eb9 X-VCS-Branch: master Date: Tue, 19 Feb 2019 14:49:22 +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: 16d82281-c4a6-49a8-b1ce-d67541fc2da6 X-Archives-Hash: f56db215bb6ef714f8fd7eff1663535b commit: b091d65077af3b9bb7e286f741f7e1e684fe5eb9 Author: Fabian Groffen gentoo org> AuthorDate: Tue Feb 19 14:48:52 2019 +0000 Commit: Fabian Groffen gentoo 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 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 }