[gentoo-commits] gentoo-x86 commit in dev-lang/perl/files/eblits: src_configure-v50160001.eblit pkg_setup-v50160001.eblit

[gentoo-commits] gentoo-x86 commit in dev-lang/perl/files/eblits: src_configure-v50160001.eblit pkg_setup-v50160001.eblit

[Michael Haubenwallner (haubi)]

haubi       13/11/22 08:56:13

  Modified:             src_configure-v50160001.eblit
                        pkg_setup-v50160001.eblit
  Log:
  perl eblits v50160001: Support AIX platform (ppc-aix keyword).
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A630CCB8)

Revision  Changes    Path
1.6                  dev-lang/perl/files/eblits/src_configure-v50160001.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit?rev=1.6&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit?r1=1.5&r2=1.6

Index: src_configure-v50160001.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_configure-v50160001.eblit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src_configure-v50160001.eblit	16 Aug 2012 10:47:29 -0000	1.5
+++ src_configure-v50160001.eblit	22 Nov 2013 08:56:13 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 myconf() {
 	# the myconf array is declared in src_configure
@@ -80,21 +80,27 @@
 	if use prefix ; then
 		local ldir
 		local paths=""
-		echo "int main() {}" > "${T}"/t.c
-		# need to ensure dirs contain compatible libs,
-		# bugs #358875, #400839, use scanelf for #425538
-		$(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die
-		local scantool=scanelf
-		[[ ${CHOST} == *-darwin* ]] && scantool=scanmacho
-		local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t)
-		einfo "searching libdirs for ${mtype}"
-		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
-			[[ -e ${ldir} ]] || continue
-			if ${scantool} -BF "%M%D#f" ${ldir}/ | grep -q ${mtype} ; then
-				paths="${paths} ${ldir}"
-				einfo "found ${ldir}"
-			fi
-		done
+		local scantool=""
+		case ${CHOST} in
+		*-aix*)    paths="/lib /usr/lib" ;;
+		*-darwin*) scantool=scanmacho ;;
+		*)         scantool=scanelf   ;;
+		esac
+		if [[ -n ${scantool} ]]; then
+			echo "int main() {}" > "${T}"/t.c
+			# need to ensure dirs contain compatible libs,
+			# bugs #358875, #400839, use scanelf for #425538
+			$(tc-getCC) -o "${T}"/t "${T}"/t.c > /dev/null || die
+			local mtype=$(${scantool} -BF "%M%D#f" "${T}"/t)
+			einfo "searching libdirs for ${mtype}"
+			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
+				[[ -e ${ldir} ]] || continue
+				if ${scantool} -BF "%M%D#f" ${ldir}/ | grep -q ${mtype} ; then
+					paths="${paths} ${ldir}"
+					einfo "found ${ldir}"
+				fi
+			done
+		fi
 		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
 	elif [[ $(get_libdir) != "lib" ]] ; then
 		# We need to use " and not ', as the written config.sh use ' ...



1.2                  dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit?r1=1.1&r2=1.2

Index: pkg_setup-v50160001.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg_setup-v50160001.eblit	5 Jun 2012 17:52:35 -0000	1.1
+++ pkg_setup-v50160001.eblit	22 Nov 2013 08:56:13 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 eblit-perl-pkg_setup() {
 	case ${CHOST} in
@@ -10,6 +10,7 @@
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-interix*)   osname="interix" ;;
+		*-aix*)       osname="aix" ;;
 		*)            osname="linux" ;;
 	esac