| 1 |
haubi 13/11/22 08:56:13 |
| 2 |
|
| 3 |
Modified: src_configure-v50160001.eblit |
| 4 |
pkg_setup-v50160001.eblit |
| 5 |
Log: |
| 6 |
perl eblits v50160001: Support AIX platform (ppc-aix keyword). |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A630CCB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.6 dev-lang/perl/files/eblits/src_configure-v50160001.eblit |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit?rev=1.6&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit?rev=1.6&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit?r1=1.5&r2=1.6 |
| 16 |
|
| 17 |
Index: src_configure-v50160001.eblit |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v |
| 20 |
retrieving revision 1.5 |
| 21 |
retrieving revision 1.6 |
| 22 |
diff -u -r1.5 -r1.6 |
| 23 |
--- src_configure-v50160001.eblit 16 Aug 2012 10:47:29 -0000 1.5 |
| 24 |
+++ src_configure-v50160001.eblit 22 Nov 2013 08:56:13 -0000 1.6 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2012 Gentoo Foundation |
| 27 |
+# Copyright 1999-2013 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v 1.5 2012/08/16 10:47:29 grobian Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v 1.6 2013/11/22 08:56:13 haubi Exp $ |
| 31 |
|
| 32 |
myconf() { |
| 33 |
# the myconf array is declared in src_configure |
| 34 |
@@ -80,21 +80,27 @@ |
| 35 |
if use prefix ; then |
| 36 |
local ldir |
| 37 |
local paths="" |
| 38 |
- echo "int main() {}" > "${T}"/t.c |
| 39 |
- # need to ensure dirs contain compatible libs, |
| 40 |
- # bugs #358875, #400839, use scanelf for #425538 |
| 41 |
- $(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die |
| 42 |
- local scantool=scanelf |
| 43 |
- [[ ${CHOST} == *-darwin* ]] && scantool=scanmacho |
| 44 |
- local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t) |
| 45 |
- einfo "searching libdirs for ${mtype}" |
| 46 |
- for ldir in /lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib ; do |
| 47 |
- [[ -e ${ldir} ]] || continue |
| 48 |
- if ${scantool} -BF "%M%D#f" ${ldir}/ | grep -q ${mtype} ; then |
| 49 |
- paths="${paths} ${ldir}" |
| 50 |
- einfo "found ${ldir}" |
| 51 |
- fi |
| 52 |
- done |
| 53 |
+ local scantool="" |
| 54 |
+ case ${CHOST} in |
| 55 |
+ *-aix*) paths="/lib /usr/lib" ;; |
| 56 |
+ *-darwin*) scantool=scanmacho ;; |
| 57 |
+ *) scantool=scanelf ;; |
| 58 |
+ esac |
| 59 |
+ if [[ -n ${scantool} ]]; then |
| 60 |
+ echo "int main() {}" > "${T}"/t.c |
| 61 |
+ # need to ensure dirs contain compatible libs, |
| 62 |
+ # bugs #358875, #400839, use scanelf for #425538 |
| 63 |
+ $(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die |
| 64 |
+ local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t) |
| 65 |
+ einfo "searching libdirs for ${mtype}" |
| 66 |
+ for ldir in /lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib ; do |
| 67 |
+ [[ -e ${ldir} ]] || continue |
| 68 |
+ if ${scantool} -BF "%M%D#f" ${ldir}/ | grep -q ${mtype} ; then |
| 69 |
+ paths="${paths} ${ldir}" |
| 70 |
+ einfo "found ${ldir}" |
| 71 |
+ fi |
| 72 |
+ done |
| 73 |
+ fi |
| 74 |
myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}" |
| 75 |
elif [[ $(get_libdir) != "lib" ]] ; then |
| 76 |
# We need to use " and not ', as the written config.sh use ' ... |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.2 dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit?rev=1.2&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit?rev=1.2&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit?r1=1.1&r2=1.2 |
| 85 |
|
| 86 |
Index: pkg_setup-v50160001.eblit |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v |
| 89 |
retrieving revision 1.1 |
| 90 |
retrieving revision 1.2 |
| 91 |
diff -u -r1.1 -r1.2 |
| 92 |
--- pkg_setup-v50160001.eblit 5 Jun 2012 17:52:35 -0000 1.1 |
| 93 |
+++ pkg_setup-v50160001.eblit 22 Nov 2013 08:56:13 -0000 1.2 |
| 94 |
@@ -1,6 +1,6 @@ |
| 95 |
-# Copyright 1999-2012 Gentoo Foundation |
| 96 |
+# Copyright 1999-2013 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v 1.1 2012/06/05 17:52:35 tove Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v 1.2 2013/11/22 08:56:13 haubi Exp $ |
| 100 |
|
| 101 |
eblit-perl-pkg_setup() { |
| 102 |
case ${CHOST} in |
| 103 |
@@ -10,6 +10,7 @@ |
| 104 |
*-openbsd*) osname="openbsd" ;; |
| 105 |
*-darwin*) osname="darwin" ;; |
| 106 |
*-interix*) osname="interix" ;; |
| 107 |
+ *-aix*) osname="aix" ;; |
| 108 |
*) osname="linux" ;; |
| 109 |
esac |
Archives