| 1 |
commit: c8e7386fe2f483f3b2441867ee044dd765a73fea |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 17 07:43:13 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 17 07:43:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e7386f |
| 7 |
|
| 8 |
dev-lang/perl: misc fixes for Solaris |
| 9 |
|
| 10 |
- set SONAME for libperl |
| 11 |
- fix arch dirs to be called *-solaris iso *-linux |
| 12 |
- add workaround for broken alignment check causing buserror on sparc |
| 13 |
|
| 14 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 15 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 16 |
|
| 17 |
dev-lang/perl/perl-5.28.0.ebuild | 11 +++++++++-- |
| 18 |
dev-lang/perl/perl-5.28.9999.ebuild | 11 +++++++++-- |
| 19 |
2 files changed, 18 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild |
| 22 |
index 13cbdc3c005..ce7173f15eb 100644 |
| 23 |
--- a/dev-lang/perl/perl-5.28.0.ebuild |
| 24 |
+++ b/dev-lang/perl/perl-5.28.0.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2018 Gentoo Authors |
| 27 |
+# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
@@ -136,6 +136,7 @@ pkg_setup() { |
| 32 |
*-netbsd*) osname="netbsd" ;; |
| 33 |
*-openbsd*) osname="openbsd" ;; |
| 34 |
*-darwin*) osname="darwin" ;; |
| 35 |
+ *-solaris*) osname="solaris" ;; |
| 36 |
*-interix*) osname="interix" ;; |
| 37 |
*-aix*) osname="aix" ;; |
| 38 |
*-cygwin*) osname="cygwin" ;; |
| 39 |
@@ -314,7 +315,9 @@ src_prepare() { |
| 40 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 41 |
# do NOT mess with nsl, on Solaris this is always necessary, |
| 42 |
# when -lsocket is used e.g. to get h_errno |
| 43 |
- sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die "Can't exclude libnsl patch" |
| 44 |
+ sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die |
| 45 |
+ # and set a soname |
| 46 |
+ sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die |
| 47 |
fi |
| 48 |
|
| 49 |
einfo "Applying patches from ${PATCH_BASE} ..." |
| 50 |
@@ -467,6 +470,10 @@ src_configure() { |
| 51 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
| 52 |
append-cflags -Dinline=__inline__ |
| 53 |
|
| 54 |
+ # fix unaligned access misdetection |
| 55 |
+ # https://rt.perl.org/Public/Bug/Display.html?id=133495 |
| 56 |
+ [[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'" |
| 57 |
+ |
| 58 |
# Prefix: the host system needs not to follow Gentoo multilib stuff, and in |
| 59 |
# Prefix itself we don't do multilib either, so make sure perl can find |
| 60 |
# something compatible. |
| 61 |
|
| 62 |
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild |
| 63 |
index 13cbdc3c005..ce7173f15eb 100644 |
| 64 |
--- a/dev-lang/perl/perl-5.28.9999.ebuild |
| 65 |
+++ b/dev-lang/perl/perl-5.28.9999.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2018 Gentoo Authors |
| 68 |
+# Copyright 1999-2019 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=6 |
| 72 |
@@ -136,6 +136,7 @@ pkg_setup() { |
| 73 |
*-netbsd*) osname="netbsd" ;; |
| 74 |
*-openbsd*) osname="openbsd" ;; |
| 75 |
*-darwin*) osname="darwin" ;; |
| 76 |
+ *-solaris*) osname="solaris" ;; |
| 77 |
*-interix*) osname="interix" ;; |
| 78 |
*-aix*) osname="aix" ;; |
| 79 |
*-cygwin*) osname="cygwin" ;; |
| 80 |
@@ -314,7 +315,9 @@ src_prepare() { |
| 81 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 82 |
# do NOT mess with nsl, on Solaris this is always necessary, |
| 83 |
# when -lsocket is used e.g. to get h_errno |
| 84 |
- sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die "Can't exclude libnsl patch" |
| 85 |
+ sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die |
| 86 |
+ # and set a soname |
| 87 |
+ sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die |
| 88 |
fi |
| 89 |
|
| 90 |
einfo "Applying patches from ${PATCH_BASE} ..." |
| 91 |
@@ -467,6 +470,10 @@ src_configure() { |
| 92 |
[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ |
| 93 |
append-cflags -Dinline=__inline__ |
| 94 |
|
| 95 |
+ # fix unaligned access misdetection |
| 96 |
+ # https://rt.perl.org/Public/Bug/Display.html?id=133495 |
| 97 |
+ [[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'" |
| 98 |
+ |
| 99 |
# Prefix: the host system needs not to follow Gentoo multilib stuff, and in |
| 100 |
# Prefix itself we don't do multilib either, so make sure perl can find |
| 101 |
# something compatible. |
Archives