[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      12/08/22 16:03:08

  Modified:             multilib.eclass
  Log:
  handle new x32 chost

Revision  Changes    Path
1.99                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.98&r2=1.99

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- multilib.eclass	3 Jun 2012 08:27:53 -0000	1.98
+++ multilib.eclass	22 Aug 2012 16:03:08 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.98 2012/06/03 08:27:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.99 2012/08/22 16:03:08 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -287,6 +287,7 @@
 		x86_64*)
 			export CFLAGS_x86=${CFLAGS_x86--m32}
 			export CHOST_x86=${CTARGET/x86_64/i686}
+			CHOST_x86=${CHOST_x86/%-gnux32/-gnu}
 			export CTARGET_x86=${CHOST_x86}
 			if [[ ${SYMLINK_LIB} == "yes" ]] ; then
 				export LIBDIR_x86="lib32"
@@ -295,17 +296,25 @@
 			fi
 
 			export CFLAGS_amd64=${CFLAGS_amd64--m64}
-			export CHOST_amd64=${CTARGET}
+			export CHOST_amd64=${CTARGET/%-gnux32/-gnu}
 			export CTARGET_amd64=${CHOST_amd64}
 			export LIBDIR_amd64="lib64"
 
 			export CFLAGS_x32=${CFLAGS_x32--mx32}
-			export CHOST_x32=${CTARGET}
+			export CHOST_x32=${CTARGET/%-gnu/-gnux32}
 			export CTARGET_x32=${CHOST_x32}
 			export LIBDIR_x32="libx32"
 
-			: ${MULTILIB_ABIS=amd64 x86}
-			: ${DEFAULT_ABI=amd64}
+			case ${CTARGET} in
+			*-gnux32)
+				: ${MULTILIB_ABIS=x32 amd64 x86}
+				: ${DEFAULT_ABI=x32}
+				;;
+			*)
+				: ${MULTILIB_ABIS=amd64 x86}
+				: ${DEFAULT_ABI=amd64}
+				;;
+			esac
 		;;
 		mips64*)
 			export CFLAGS_o32=${CFLAGS_o32--mabi=32}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      14/01/17 07:44:45

  Modified:             multilib.eclass
  Log:
  s/aarch64/arm64/ for ABI names

Revision  Changes    Path
1.105                eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.104&r2=1.105

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- multilib.eclass	17 Jan 2014 06:21:15 -0000	1.104
+++ multilib.eclass	17 Jan 2014 07:44:45 -0000	1.105
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.104 2014/01/17 06:21:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.105 2014/01/17 07:44:45 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -294,13 +294,13 @@
 			export CTARGET_arm=${CHOST_arm}
 			export LIBDIR_arm="lib"
 
-			export CFLAGS_aarch64=${CFLAGS_aarch64-}
-			export CHOST_aarch64=${CTARGET}
-			export CTARGET_aarch64=${CHOST_aarch64}
-			export LIBDIR_aarch64="lib64"
+			export CFLAGS_arm64=${CFLAGS_arm64-}
+			export CHOST_arm64=${CTARGET}
+			export CTARGET_arm64=${CHOST_arm64}
+			export LIBDIR_arm64="lib64"
 
-			: ${MULTILIB_ABIS=aarch64}
-			: ${DEFAULT_ABI=aarch64}
+			: ${MULTILIB_ABIS=arm64}
+			: ${DEFAULT_ABI=arm64}
 		;;
 		x86_64*)
 			export CFLAGS_x86=${CFLAGS_x86--m32}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      14/01/17 06:21:15

  Modified:             multilib.eclass
  Log:
  multilib_env: add aarch64 details

Revision  Changes    Path
1.104                eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.103&r2=1.104

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- multilib.eclass	22 Apr 2013 01:18:51 -0000	1.103
+++ multilib.eclass	17 Jan 2014 06:21:15 -0000	1.104
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.103 2013/04/22 01:18:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.104 2014/01/17 06:21:15 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -280,8 +280,28 @@
 # a crosscompiler (and thus they aren't set in the profile)
 multilib_env() {
 	local CTARGET=${1:-${CTARGET}}
+	local cpu=${CTARGET%%*-}
 
-	case ${CTARGET} in
+	case ${cpu} in
+		aarch64*)
+			# Not possible to do multilib with aarch64 and a single toolchain.
+			export CFLAGS_arm=${CFLAGS_arm-}
+			case ${cpu} in
+			aarch64*be) export CHOST_arm="armv8b-${CTARGET#*-}";;
+			*)          export CHOST_arm="armv8l-${CTARGET#*-}";;
+			esac
+			CHOST_arm=${CHOST_arm/%-gnu/-gnueabi}
+			export CTARGET_arm=${CHOST_arm}
+			export LIBDIR_arm="lib"
+
+			export CFLAGS_aarch64=${CFLAGS_aarch64-}
+			export CHOST_aarch64=${CTARGET}
+			export CTARGET_aarch64=${CHOST_aarch64}
+			export LIBDIR_aarch64="lib64"
+
+			: ${MULTILIB_ABIS=aarch64}
+			: ${DEFAULT_ABI=aarch64}
+		;;
 		x86_64*)
 			export CFLAGS_x86=${CFLAGS_x86--m32}
 			export CHOST_x86=${CTARGET/x86_64/i686}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      13/04/22 01:18:51

  Modified:             multilib.eclass
  Log:
  keep unset multilib vars unset rather than exporting them as empty #461682 by Julian Ospald

Revision  Changes    Path
1.103                eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.102&r2=1.103

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- multilib.eclass	21 Jan 2013 19:22:25 -0000	1.102
+++ multilib.eclass	22 Apr 2013 01:18:51 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.102 2013/01/21 19:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.103 2013/04/22 01:18:51 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -397,7 +397,7 @@
 	if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then
 		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			vv="__abi_saved_${v}"
-			export ${v}="${!vv}"
+			[[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v}
 			unset ${vv}
 		done
 		unset __DEFAULT_ABI_SAVED
@@ -408,7 +408,8 @@
 	if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
 		# Back that multilib-ass up so we can restore it later
 		for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do
-			export __abi_saved_${v}="${!v}"
+			vv="__abi_saved_${v}"
+			[[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv}
 		done
 		export __DEFAULT_ABI_SAVED="true"
 

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      12/10/17 19:13:18

  Modified:             multilib.eclass
  Log:
  only enable multilib by default for sparc64 targets #397449 by Sergei Trofimovich

Revision  Changes    Path
1.101                eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.100&r2=1.101

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- multilib.eclass	27 Aug 2012 15:04:08 -0000	1.100
+++ multilib.eclass	17 Oct 2012 19:13:18 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.100 2012/08/27 15:04:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.101 2012/10/17 19:13:18 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -361,7 +361,7 @@
 			: ${MULTILIB_ABIS=s390x s390}
 			: ${DEFAULT_ABI=s390x}
 		;;
-		sparc*)
+		sparc64*)
 			export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
 			export CHOST_sparc32=${CTARGET/sparc64/sparc}
 			export CTARGET_sparc32=${CHOST_sparc32}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      12/08/27 15:04:09

  Modified:             multilib.eclass
  Log:
  add local to a few missing vars

Revision  Changes    Path
1.100                eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.99&r2=1.100

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- multilib.eclass	22 Aug 2012 16:03:08 -0000	1.99
+++ multilib.eclass	27 Aug 2012 15:04:08 -0000	1.100
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.99 2012/08/22 16:03:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.100 2012/08/27 15:04:08 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -121,7 +121,7 @@
 # Return a list of the ABIs we want to install for with
 # the last one in the list being the default.
 get_install_abis() {
-	local order=""
+	local x order=""
 
 	if [[ -z ${MULTILIB_ABIS} ]] ; then
 		echo "default"
@@ -162,7 +162,7 @@
 # Return a list of the ABIs supported by this profile.
 # the last one in the list being the default.
 get_all_abis() {
-	local order="" mvar dvar
+	local x order="" mvar dvar
 
 	mvar="MULTILIB_ABIS"
 	dvar="DEFAULT_ABI"
@@ -193,9 +193,7 @@
 # those that might not be touched by the current ebuild and always includes
 # "lib".
 get_all_libdirs() {
-	local libdirs
-	local abi
-	local dir
+	local libdirs abi
 
 	for abi in ${MULTILIB_ABIS}; do
 		libdirs+=" $(get_abi_LIBDIR ${abi})"

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      12/06/03 08:27:53

  Modified:             multilib.eclass
  Log:
  all callers to specify a different set of ABIs with get_all_abis so that we can query the abis for CTARGET with cross-compilers

Revision  Changes    Path
1.98                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.97&r2=1.98

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- multilib.eclass	14 Dec 2011 18:15:09 -0000	1.97
+++ multilib.eclass	3 Jun 2012 08:27:53 -0000	1.98
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.97 2011/12/14 18:15:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.98 2012/06/03 08:27:53 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -162,19 +162,26 @@
 # Return a list of the ABIs supported by this profile.
 # the last one in the list being the default.
 get_all_abis() {
-	local order=""
+	local order="" mvar dvar
 
-	if [[ -z ${MULTILIB_ABIS} ]] ; then
+	mvar="MULTILIB_ABIS"
+	dvar="DEFAULT_ABI"
+	if [[ -n $1 ]] ; then
+		mvar="$1_${mvar}"
+		dvar="$1_${dvar}"
+	fi
+
+	if [[ -z ${!mvar} ]] ; then
 		echo "default"
 		return 0
 	fi
 
-	for x in ${MULTILIB_ABIS}; do
-		if [[ ${x} != ${DEFAULT_ABI} ]] ; then
+	for x in ${!mvar}; do
+		if [[ ${x} != ${!dvar} ]] ; then
 			order="${order:+${order} }${x}"
 		fi
 	done
-	order="${order:+${order} }${DEFAULT_ABI}"
+	order="${order:+${order} }${!dvar}"
 
 	echo ${order}
 	return 0

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/12/10 19:41:51

  Modified:             multilib.eclass
  Log:
  avoid multiple inclusions when possible to speed caching up

Revision  Changes    Path
1.96                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.95&r2=1.96

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- multilib.eclass	27 Oct 2011 05:50:40 -0000	1.95
+++ multilib.eclass	10 Dec 2011 19:41:51 -0000	1.96
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.95 2011/10/27 05:50:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.96 2011/12/10 19:41:51 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -10,8 +10,10 @@
 # @DESCRIPTION:
 # This eclass is for all functions pertaining to handling multilib configurations.
 
-___ECLASS_RECUR_MULTILIB="yes"
-[[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
+if [[ ${___ECLASS_ONCE_MULTILIB} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_MULTILIB="recur -_+^+_- spank"
+
+inherit toolchain-funcs
 
 # Defaults:
 export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
@@ -406,3 +408,5 @@
 		export CBUILD=$(get_abi_CHOST $1)
 	fi
 }
+
+fi

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/10/27 05:50:40

  Modified:             multilib.eclass
  Log:
  drop AS export since get_abi_ASFLAGS no longer exists

Revision  Changes    Path
1.95                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.94&r2=1.95

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- multilib.eclass	17 Oct 2011 19:14:14 -0000	1.94
+++ multilib.eclass	27 Oct 2011 05:50:40 -0000	1.95
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.94 2011/10/17 19:14:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.95 2011/10/27 05:50:40 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -399,7 +399,6 @@
 		# Set the CHOST native first so that we pick up the native
 		# toolchain and not a cross-compiler by accident #202811.
 		export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
-		export AS="$(tc-getAS) $(get_abi_ASFLAGS)"
 		export CC="$(tc-getCC) $(get_abi_CFLAGS)"
 		export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
 		export LD="$(tc-getLD) $(get_abi_LDFLAGS)"

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/10/17 19:14:14

  Modified:             multilib.eclass
  Log:
  simplify get_abi_var logic a bit

Revision  Changes    Path
1.94                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.93&r2=1.94

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- multilib.eclass	14 Oct 2011 22:54:35 -0000	1.93
+++ multilib.eclass	17 Oct 2011 19:14:14 -0000	1.94
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.93 2011/10/14 22:54:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.94 2011/10/17 19:14:14 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -73,17 +73,7 @@
 # If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
 get_abi_var() {
 	local flag=$1
-	local abi
-	if [ $# -gt 1 ]; then
-		abi=${2}
-	elif [ -n "${ABI}" ]; then
-		abi=${ABI}
-	elif [ -n "${DEFAULT_ABI}" ]; then
-		abi=${DEFAULT_ABI}
-	else
-		abi="default"
-	fi
-
+	local abi=${2:-${ABI:-${DEFAULT_ABI:-default}}}
 	local var="${flag}_${abi}"
 	echo ${!var}
 }

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/10/14 22:54:35

  Modified:             multilib.eclass
  Log:
  delete unused functions

Revision  Changes    Path
1.93                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.92&r2=1.93

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- multilib.eclass	18 Aug 2011 14:58:57 -0000	1.92
+++ multilib.eclass	14 Oct 2011 22:54:35 -0000	1.93
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.92 2011/08/18 14:58:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.93 2011/10/14 22:54:35 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -57,40 +57,10 @@
 	fi
 }
 
-# @FUNCTION: get_multilibdir
-# @RETURN: Returns the multilibdir
-get_multilibdir() {
-	if has_multilib_profile; then
-		eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach.  Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
-		exit 1
-	fi
-	echo ${CONF_MULTILIBDIR:=lib32}
-}
-
-# @FUNCTION: get_libdir_override
-# @DESCRIPTION:
-# Sometimes you need to override the value returned by get_libdir. A good
-# example of this is xorg-x11, where lib32 isnt a supported configuration,
-# and where lib64 -must- be used on amd64 (for applications that need lib
-# to be 32bit, such as adobe acrobat). Note that this override also bypasses
-# portage version sanity checking.
-# get_libdir_override expects one argument, the result get_libdir should
-# return:
-#
-#   get_libdir_override lib64
-get_libdir_override() {
-	if has_multilib_profile; then
-		eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach.  Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
-		exit 1
-	fi
-	CONF_LIBDIR="$1"
-	CONF_LIBDIR_OVERRIDE="$1"
-	LIBDIR_default="$1"
-}
-
 # @FUNCTION: get_abi_var
 # @USAGE: <VAR> [ABI]
 # @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
+# @INTERNAL
 # @DESCRIPTION:
 # ex:
 # CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
@@ -124,12 +94,6 @@
 # Alias for 'get_abi_var CFLAGS'
 get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
 
-# @FUNCTION: get_abi_ASFLAGS
-# @USAGE: [ABI]
-# @DESCRIPTION:
-# Alias for 'get_abi_var ASFLAGS'
-get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; }
-
 # @FUNCTION: get_abi_LDFLAGS
 # @USAGE: [ABI]
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/18 22:03:25

  Modified:             multilib.eclass
  Log:
  punt now unused get_ml_incdir/prep_ml_includes funcs and associated CDEFINE logic

Revision  Changes    Path
1.90                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.89&r2=1.90

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- multilib.eclass	18 Mar 2011 21:58:15 -0000	1.89
+++ multilib.eclass	18 Mar 2011 22:03:25 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.89 2011/03/18 21:58:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.90 2011/03/18 22:03:25 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -21,7 +21,6 @@
 export CHOST_default=${CHOST_default:-${CHOST}}
 export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
 export LIBDIR_default=${CONF_LIBDIR:-"lib"}
-export CDEFINE_default="__unix__"
 export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
 
 # @FUNCTION: has_multilib_profile
@@ -155,12 +154,6 @@
 # Alias for 'get_abi_var FAKE_TARGETS'
 get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
 
-# @FUNCTION: get_abi_CDEFINE
-# @USAGE: [ABI]
-# @DESCRIPTION:
-# Alias for 'get_abi_var CDEFINE'
-get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
-
 # @FUNCTION: get_abi_LIBDIR
 # @USAGE: [ABI]
 # @DESCRIPTION:
@@ -269,256 +262,6 @@
 	echo $#
 }
 
-# @FUNCTION: get_ml_incdir
-# @USAGE: [include_dir] [ABI]
-# @DESCRIPTION:
-# include dir defaults to /usr/include
-# ABI defaults to ${ABI} or ${DEFAULT_ABI}
-#
-# If a multilib include dir is associated with the passed include dir, then
-# we return it, otherwise, we just echo back the include dir.  This is
-# neccessary when a built script greps header files rather than testing them
-# via #include (like perl) to figure out features.
-get_ml_incdir() {
-	local dir=/usr/include
-
-	if [[ $# -gt 0 ]]; then
-		incdir=$1
-		shift
-	fi
-
-	if [[ -z "${MULTILIB_ABIS}" ]]; then
-		echo ${incdir}
-		return 0
-	fi
-
-	local abi=${ABI-${DEFAULT_ABI}}
-	if [[ $# -gt 0 ]]; then
-		abi=$1
-		shift
-	fi
-
-	if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
-		echo ${dir}/gentoo-multilib/${abi}
-	else
-		echo ${dir}
-	fi
-}
-
-# @FUNCTION: prep_ml_includes
-# @DESCRIPTION:
-# Some includes (include/asm, glibc, etc) are ABI dependent.  In this case,
-# We can install them in different locations for each ABI and create a common
-# header which includes the right one based on CDEFINE_${ABI}.  If your
-# package installs ABI-specific headers, just add 'prep_ml_includes' to the
-# end of your src_install().  It takes a list of directories that include
-# files are installed in (default is /usr/include if none are passed).
-#
-# Example:
-#     src_install() {
-#        ...
-#        prep_ml_includes /usr/qt/3/include
-#     }
-prep_ml_includes() {
-	if [[ $(number_abis) -gt 1 ]] ; then
-		local dir
-		local dirs
-		local base
-
-		if [[ $# -eq 0 ]] ; then
-			dirs=/usr/include
-		else
-			dirs="$@"
-		fi
-
-		for dir in ${dirs} ; do
-			base=${T}/gentoo-multilib/${dir}/gentoo-multilib
-			mkdir -p "${base}"
-			[[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
-			mv "${D}/${dir}" "${base}/${ABI}"
-		done
-
-		if is_final_abi; then
-			base=${T}/gentoo-multilib
-			pushd "${base}"
-			find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C "${D}"
-			popd
-
-			# This 'set' stuff is required by mips profiles to properly pass
-			# CDEFINE's (which have spaces) to sub-functions
-			set --
-			for dir in ${dirs} ; do
-				set -- "$@" "${dir}"
-				local abi
-				for abi in $(get_install_abis); do
-					set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
-				done
-				create_ml_includes "$@"
-			done
-		fi
-	fi
-}
-
-# @FUNCTION: create_ml_includes
-# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
-# @DESCRIPTION:
-# If you need more control than prep_ml_includes can offer (like linux-headers
-# for the asm-* dirs, then use create_ml_includes.  The firs argument is the
-# common dir.  The remaining args are of the form <symbol>:<dir> where
-# <symbol> is what is put in the #ifdef for choosing that dir.
-#
-# Ideas for this code came from debian's sparc-linux headers package.
-#
-# Example:
-#     create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
-#     create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
-#
-# Warning: Be careful with the ordering here. The default ABI has to be the
-# last, because it is always defined (by GCC)
-create_ml_includes() {
-	local dest=$1
-	shift
-	local basedirs=$(create_ml_includes-listdirs "$@")
-
-	create_ml_includes-makedestdirs ${dest} ${basedirs}
-
-	local file
-	for file in $(create_ml_includes-allfiles ${basedirs}) ; do
-		#local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
-		(
-			echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
-
-			local dir
-			for dir in ${basedirs}; do
-				if [[ -f ${D}/${dir}/${file} ]] ; then
-					echo ""
-					local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
-					if [[ ${sym/=} != "${sym}" ]] ; then
-						echo "#if ${sym}"
-					elif [[ ${sym::1} == "!" ]] ; then
-						echo "#ifndef ${sym:1}"
-					else
-						echo "#ifdef ${sym}"
-					fi
-					echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
-					echo "#endif /* ${sym} */"
-				fi
-			done
-
-			#echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
-		) > "${D}/${dest}/${file}"
-	done
-}
-
-# Helper function for create_ml_includes
-create_ml_includes-absolute() {
-	local dst="$(create_ml_includes-tidy_path $1)"
-
-	dst=(${dst//\// })
-
-	local i
-	for ((i=0; i<${#dst[*]}; i++)); do
-		[ "${dst[i]}" == "include" ] && break
-	done
-
-	local strip_upto=$i
-
-	for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
-		echo -n ${dst[i]}/
-	done
-
-	echo -n ${dst[i]}
-}
-
-# Helper function for create_ml_includes
-create_ml_includes-tidy_path() {
-	local removed=$1
-
-	if [ -n "${removed}" ]; then
-		# Remove multiple slashes
-		while [ "${removed}" != "${removed/\/\//\/}" ]; do
-			removed=${removed/\/\//\/}
-		done
-
-		# Remove . directories
-		while [ "${removed}" != "${removed//\/.\//\/}" ]; do
-			removed=${removed//\/.\//\/}
-		done
-		[ "${removed##*/}" = "." ] && removed=${removed%/*}
-
-		# Removed .. directories
-		while [ "${removed}" != "${removed//\/..\/}" ]; do
-			local p1="${removed%%\/..\/*}"
-			local p2="${removed#*\/..\/}"
-
-			removed="${p1%\/*}/${p2}"
-		done
-
-		# Remove trailing ..
-		[ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
-
-		# Remove trailing /
-		[ "${removed##*/}" = "" ] && removed=${removed%/*}
-
-		echo ${removed}
-	fi
-}
-
-# Helper function for create_ml_includes
-create_ml_includes-listdirs() {
-	local dirs
-	local data
-	for data in "$@"; do
-		dirs="${dirs} ${data/*:/}"
-	done
-	echo ${dirs:1}
-}
-
-# Helper function for create_ml_includes
-create_ml_includes-makedestdirs() {
-	local dest=$1
-	shift
-	local basedirs=$@
-	[[ -z ${ED} ]] && local ED=${D}
-
-	dodir ${dest}
-
-	local basedir
-	for basedir in ${basedirs}; do
-		local dir
-		for dir in $(find "${ED}"/${basedir} -type d); do
-			dodir ${dest}/${dir/${ED}\/${basedir}/}
-		done
-	done
-}
-
-# Helper function for create_ml_includes
-create_ml_includes-allfiles() {
-	[[ -z ${ED} ]] && local ED=${D}
-	local basedir file
-	for basedir in "$@" ; do
-		for file in $(find "${ED}"/${basedir} -type f); do
-			echo ${file/${ED}\/${basedir}\//}
-		done
-	done | sort | uniq
-}
-
-# Helper function for create_ml_includes
-create_ml_includes-sym_for_dir() {
-	local dir=$1
-	shift
-	local data
-	for data in "$@"; do
-		if [[ ${data} == *:${dir} ]] ; then
-			echo ${data/:*/}
-			return 0
-		fi
-	done
-	echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
-	# exit because we'll likely be called from a subshell
-	exit 1
-}
-
 # @FUNCTION: get_libname
 # @USAGE: [version]
 # @DESCRIPTION:
@@ -582,7 +325,6 @@
 			export CFLAGS_x86=${CFLAGS_x86--m32}
 			export CHOST_x86=${CTARGET/x86_64/i686}
 			export CTARGET_x86=${CHOST_x86}
-			export CDEFINE_x86="__i386__"
 			if [[ ${SYMLINK_LIB} == "yes" ]] ; then
 				export LIBDIR_x86="lib32"
 			else
@@ -592,13 +334,11 @@
 			export CFLAGS_amd64=${CFLAGS_amd64--m64}
 			export CHOST_amd64=${CTARGET}
 			export CTARGET_amd64=${CHOST_amd64}
-			export CDEFINE_amd64="__x86_64__"
 			export LIBDIR_amd64="lib64"
 
 			export CFLAGS_x32=${CFLAGS_x32--mx32}
 			export CHOST_x32=${CTARGET}
 			export CTARGET_x32=${CHOST_x32}
-			export CDEFINE_x32="__i386__"
 			export LIBDIR_x32="libx32"
 
 			: ${MULTILIB_ABIS=amd64 x86}
@@ -608,19 +348,16 @@
 			export CFLAGS_o32=${CFLAGS_o32--mabi=32}
 			export CHOST_o32=${CTARGET/mips64/mips}
 			export CTARGET_o32=${CHOST_o32}
-			export CDEFINE_o32="_MIPS_SIM == _ABIO32"
 			export LIBDIR_o32="lib"
 
 			export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
 			export CHOST_n32=${CTARGET}
 			export CTARGET_n32=${CHOST_n32}
-			export CDEFINE_n32="_MIPS_SIM == _ABIN32"
 			export LIBDIR_n32="lib32"
 
 			export CFLAGS_n64=${CFLAGS_n64--mabi=64}
 			export CHOST_n64=${CTARGET}
 			export CTARGET_n64=${CHOST_n64}
-			export CDEFINE_n64="_MIPS_SIM == _ABI64"
 			export LIBDIR_n64="lib64"
 
 			: ${MULTILIB_ABIS=n64 n32 o32}
@@ -630,13 +367,11 @@
 			export CFLAGS_ppc=${CFLAGS_ppc--m32}
 			export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 			export CTARGET_ppc=${CHOST_ppc}
-			export CDEFINE_ppc="!__powerpc64__"
 			export LIBDIR_ppc="lib"
 
 			export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
 			export CHOST_ppc64=${CTARGET}
 			export CTARGET_ppc64=${CHOST_ppc64}
-			export CDEFINE_ppc64="__powerpc64__"
 			export LIBDIR_ppc64="lib64"
 
 			: ${MULTILIB_ABIS=ppc64 ppc}
@@ -646,13 +381,11 @@
 			export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
 			export CHOST_s390=${CTARGET/s390x/s390}
 			export CTARGET_s390=${CHOST_s390}
-			export CDEFINE_s390="!__s390x__"
 			export LIBDIR_s390="lib"
 
 			export CFLAGS_s390x=${CFLAGS_s390x--m64}
 			export CHOST_s390x=${CTARGET}
 			export CTARGET_s390x=${CHOST_s390x}
-			export CDEFINE_s390x="__s390x__"
 			export LIBDIR_s390x="lib64"
 
 			: ${MULTILIB_ABIS=s390x s390}
@@ -662,13 +395,11 @@
 			export CFLAGS_sparc32=${CFLAGS_sparc32}
 			export CHOST_sparc32=${CTARGET/sparc64/sparc}
 			export CTARGET_sparc32=${CHOST_sparc32}
-			export CDEFINE_sparc32="!__arch64__"
 			export LIBDIR_sparc32="lib"
 
 			export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
 			export CHOST_sparc64=${CTARGET}
 			export CTARGET_sparc64=${CHOST_sparc64}
-			export CDEFINE_sparc64="__arch64__"
 			export LIBDIR_sparc64="lib64"
 
 			: ${MULTILIB_ABIS=sparc64 sparc32}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/18 21:58:15

  Modified:             multilib.eclass
  Log:
  fix typos in get_install_abis ... not that this code gets used as no one seems to set EMULTILIB_PKG

Revision  Changes    Path
1.89                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.88&r2=1.89

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- multilib.eclass	18 Mar 2011 21:56:35 -0000	1.88
+++ multilib.eclass	18 Mar 2011 21:58:15 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.88 2011/03/18 21:56:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.89 2011/03/18 21:58:15 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -182,10 +182,10 @@
 	if [[ ${EMULTILIB_PKG} == "true" ]] ; then
 		for x in ${MULTILIB_ABIS} ; do
 			if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
-				hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
+				hasq ${x} ${ABI_DENY} || order="${order} ${x}"
 			fi
 		done
-		hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
+		hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}"
 
 		if [[ -n ${ABI_ALLOW} ]] ; then
 			local ordera=""

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/18 21:56:35

  Modified:             multilib.eclass
  Log:
  rewrite number_abis in pure bash

Revision  Changes    Path
1.88                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.87&r2=1.88

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- multilib.eclass	18 Mar 2011 19:13:54 -0000	1.87
+++ multilib.eclass	18 Mar 2011 21:56:35 -0000	1.88
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.87 2011/03/18 19:13:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.88 2011/03/18 21:56:35 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -265,7 +265,8 @@
 # @DESCRIPTION:
 # echo the number of ABIs we will be installing for
 number_abis() {
-	get_install_abis | wc -w
+	set -- `get_install_abis`
+	echo $#
 }
 
 # @FUNCTION: get_ml_incdir

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/18 19:13:54

  Modified:             multilib.eclass
  Log:
  fix typo in SYMLINK_LIB name

Revision  Changes    Path
1.87                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.86&r2=1.87

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- multilib.eclass	18 Mar 2011 19:12:08 -0000	1.86
+++ multilib.eclass	18 Mar 2011 19:13:54 -0000	1.87
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.86 2011/03/18 19:12:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.87 2011/03/18 19:13:54 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -582,7 +582,7 @@
 			export CHOST_x86=${CTARGET/x86_64/i686}
 			export CTARGET_x86=${CHOST_x86}
 			export CDEFINE_x86="__i386__"
-			if [[ ${SYMLINK_LIBDIR} == "yes" ]] ; then
+			if [[ ${SYMLINK_LIB} == "yes" ]] ; then
 				export LIBDIR_x86="lib32"
 			else
 				export LIBDIR_x86="lib"

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/18 19:12:08

  Modified:             multilib.eclass
  Log:
  use "lib" for x86 ABI when SYMLINK_LIBDIR=no

Revision  Changes    Path
1.86                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.85&r2=1.86

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- multilib.eclass	16 Mar 2011 20:09:10 -0000	1.85
+++ multilib.eclass	18 Mar 2011 19:12:08 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.85 2011/03/16 20:09:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.86 2011/03/18 19:12:08 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -582,7 +582,11 @@
 			export CHOST_x86=${CTARGET/x86_64/i686}
 			export CTARGET_x86=${CHOST_x86}
 			export CDEFINE_x86="__i386__"
-			export LIBDIR_x86="lib32"
+			if [[ ${SYMLINK_LIBDIR} == "yes" ]] ; then
+				export LIBDIR_x86="lib32"
+			else
+				export LIBDIR_x86="lib"
+			fi
 
 			export CFLAGS_amd64=${CFLAGS_amd64--m64}
 			export CHOST_amd64=${CTARGET}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/16 20:09:10

  Modified:             multilib.eclass
  Log:
  get_all_libdirs: append "lib" only if it wasnt already seen rather than always making it the first item #357225

Revision  Changes    Path
1.85                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.84&r2=1.85

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- multilib.eclass	10 Mar 2011 05:01:47 -0000	1.84
+++ multilib.eclass	16 Mar 2011 20:09:10 -0000	1.85
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.84 2011/03/10 05:01:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.85 2011/03/16 20:09:10 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -237,13 +237,14 @@
 # those that might not be touched by the current ebuild and always includes
 # "lib".
 get_all_libdirs() {
-	local libdirs="lib"
+	local libdirs
 	local abi
 	local dir
 
 	for abi in ${MULTILIB_ABIS}; do
-		[ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
+		libdirs+=" $(get_abi_LIBDIR ${abi})"
 	done
+	[[ " ${libdirs} " != *" lib "* ]] && libdirs+=" lib"
 
 	echo "${libdirs}"
 }

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/10 05:01:47

  Modified:             multilib.eclass
  Log:
  fix typo in new multilib_env export code pointed out by Ryan

Revision  Changes    Path
1.84                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.83&r2=1.84

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- multilib.eclass	10 Mar 2011 04:29:58 -0000	1.83
+++ multilib.eclass	10 Mar 2011 05:01:47 -0000	1.84
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.83 2011/03/10 04:29:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.84 2011/03/10 05:01:47 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -674,7 +674,7 @@
 		;;
 	esac
 
-	export MULTILIB_ABIS MULTILIB_ABI
+	export MULTILIB_ABIS DEFAULT_ABI
 }
 
 # @FUNCTION: multilib_toolchain_setup

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/10 04:29:58

  Modified:             multilib.eclass
  Log:
  is_final_abi: rewrite with bash arrays to simplify a bit

Revision  Changes    Path
1.83                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.82&r2=1.83

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- multilib.eclass	10 Mar 2011 04:26:38 -0000	1.82
+++ multilib.eclass	10 Mar 2011 04:29:58 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.82 2011/03/10 04:26:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.83 2011/03/10 04:29:58 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -255,9 +255,9 @@
 # if we're in the last (or only) run through src_{unpack,compile,install}
 is_final_abi() {
 	has_multilib_profile || return 0
-	local ALL_ABIS=$(get_install_abis)
-	local LAST_ABI=${ALL_ABIS/* /}
-	[[ ${LAST_ABI} == ${ABI} ]]
+	set -- $(get_install_abis)
+	local LAST_ABI=$#
+	[[ ${!LAST_ABI} == ${ABI} ]]
 }
 
 # @FUNCTION: number_abis

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/10 04:26:38

  Modified:             multilib.eclass
  Log:
  dont hard reset MULTILIB_ABIS/DEFAULT_ABI ... this fixes no-multilib builds #358093 by Marien Zwart as well as is_final_abi handling #358143 by Pacho Ramos

Revision  Changes    Path
1.82                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.81&r2=1.82

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- multilib.eclass	10 Mar 2011 01:52:22 -0000	1.81
+++ multilib.eclass	10 Mar 2011 04:26:38 -0000	1.82
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.81 2011/03/10 01:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.82 2011/03/10 04:26:38 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -589,8 +589,14 @@
 			export CDEFINE_amd64="__x86_64__"
 			export LIBDIR_amd64="lib64"
 
-			export MULTILIB_ABIS="amd64 x86"
-			export DEFAULT_ABI="amd64"
+			export CFLAGS_x32=${CFLAGS_x32--mx32}
+			export CHOST_x32=${CTARGET}
+			export CTARGET_x32=${CHOST_x32}
+			export CDEFINE_x32="__i386__"
+			export LIBDIR_x32="libx32"
+
+			: ${MULTILIB_ABIS=amd64 x86}
+			: ${DEFAULT_ABI=amd64}
 		;;
 		mips64*)
 			export CFLAGS_o32=${CFLAGS_o32--mabi=32}
@@ -611,8 +617,8 @@
 			export CDEFINE_n64="_MIPS_SIM == _ABI64"
 			export LIBDIR_n64="lib64"
 
-			export MULTILIB_ABIS="n64 n32 o32"
-			export DEFAULT_ABI="n32"
+			: ${MULTILIB_ABIS=n64 n32 o32}
+			: ${DEFAULT_ABI=n32}
 		;;
 		powerpc64*)
 			export CFLAGS_ppc=${CFLAGS_ppc--m32}
@@ -627,8 +633,8 @@
 			export CDEFINE_ppc64="__powerpc64__"
 			export LIBDIR_ppc64="lib64"
 
-			export MULTILIB_ABIS="ppc64 ppc"
-			export DEFAULT_ABI="ppc64"
+			: ${MULTILIB_ABIS=ppc64 ppc}
+			: ${DEFAULT_ABI=ppc64}
 		;;
 		s390x*)
 			export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
@@ -643,8 +649,8 @@
 			export CDEFINE_s390x="__s390x__"
 			export LIBDIR_s390x="lib64"
 
-			export MULTILIB_ABIS="s390x s390"
-			export DEFAULT_ABI="s390x"
+			: ${MULTILIB_ABIS=s390x s390}
+			: ${DEFAULT_ABI=s390x}
 		;;
 		sparc*)
 			export CFLAGS_sparc32=${CFLAGS_sparc32}
@@ -659,14 +665,16 @@
 			export CDEFINE_sparc64="__arch64__"
 			export LIBDIR_sparc64="lib64"
 
-			export MULTILIB_ABIS="${MULTILIB_ABIS-sparc64 sparc32}"
-			export DEFAULT_ABI="${DEFAULT_ABI-sparc64}"
+			: ${MULTILIB_ABIS=sparc64 sparc32}
+			: ${DEFAULT_ABI=sparc64}
 		;;
 		*)
-			export MULTILIB_ABIS="default"
-			export DEFAULT_ABI="default"
+			: ${MULTILIB_ABIS=default}
+			: ${DEFAULT_ABI=default}
 		;;
 	esac
+
+	export MULTILIB_ABIS MULTILIB_ABI
 }
 
 # @FUNCTION: multilib_toolchain_setup

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/10 01:52:22

  Modified:             multilib.eclass
  Log:
  make sure we restore the previous abi env vars every time we load up a new abi #358147 by Matt Turner

Revision  Changes    Path
1.81                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.80&r2=1.81

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- multilib.eclass	7 Mar 2011 02:46:28 -0000	1.80
+++ multilib.eclass	10 Mar 2011 01:52:22 -0000	1.81
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.80 2011/03/07 02:46:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.81 2011/03/10 01:52:22 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -678,15 +678,24 @@
 
 	export ABI=$1
 
+	# First restore any saved state we have laying around.
+	if [[ ${__DEFAULT_ABI_SAVED} == "true" ]] ; then
+		for v in CHOST CBUILD AS CC CXX LD ; do
+			vv="__abi_saved_${v}"
+			export ${v}="${!vv}"
+			unset ${vv}
+		done
+		unset __DEFAULT_ABI_SAVED
+	fi
+
 	# We want to avoid the behind-the-back magic of gcc-config as it
 	# screws up ccache and distcc.  See #196243 for more info.
 	if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
-		if [[ ${DEFAULT_ABI_SAVED} != "true" ]] ; then
-			for v in CHOST CBUILD AS CC CXX LD ; do
-				export __abi_saved_${v}="${!v}"
-			done
-			export DEFAULT_ABI_SAVED="true"
-		fi
+		# Back that multilib-ass up so we can restore it later
+		for v in CHOST CBUILD AS CC CXX LD ; do
+			export __abi_saved_${v}="${!v}"
+		done
+		export __DEFAULT_ABI_SAVED="true"
 
 		# Set the CHOST native first so that we pick up the native
 		# toolchain and not a cross-compiler by accident #202811.
@@ -697,11 +706,5 @@
 		export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
 		export CHOST=$(get_abi_CHOST $1)
 		export CBUILD=$(get_abi_CHOST $1)
-
-	elif [[ ${DEFAULT_ABI_SAVED} == "true" ]] ; then
-		for v in CHOST CBUILD AS CC CXX LD ; do
-			vv="__abi_saved_${v}"
-			export ${v}="${!vv}"
-		done
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      11/03/07 02:46:28

  Modified:             multilib.eclass
  Log:
  x86 abi on 64bit host is "lib32" not "lib"

Revision  Changes    Path
1.80                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.79&r2=1.80

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- multilib.eclass	14 Aug 2010 21:31:29 -0000	1.79
+++ multilib.eclass	7 Mar 2011 02:46:28 -0000	1.80
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.79 2010/08/14 21:31:29 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.80 2011/03/07 02:46:28 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -581,7 +581,7 @@
 			export CHOST_x86=${CTARGET/x86_64/i686}
 			export CTARGET_x86=${CHOST_x86}
 			export CDEFINE_x86="__i386__"
-			export LIBDIR_x86="lib"
+			export LIBDIR_x86="lib32"
 
 			export CFLAGS_amd64=${CFLAGS_amd64--m64}
 			export CHOST_amd64=${CTARGET}

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Harald van Dijk (truedfx)]

truedfx     10/08/14 21:31:29

  Modified:             multilib.eclass
  Log:
  Fix quoting

Revision  Changes    Path
1.79                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.78&r2=1.79

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- multilib.eclass	20 May 2010 08:22:15 -0000	1.78
+++ multilib.eclass	14 Aug 2010 21:31:29 -0000	1.79
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.78 2010/05/20 08:22:15 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.79 2010/08/14 21:31:29 truedfx Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -701,7 +701,7 @@
 	elif [[ ${DEFAULT_ABI_SAVED} == "true" ]] ; then
 		for v in CHOST CBUILD AS CC CXX LD ; do
 			vv="__abi_saved_${v}"
-			export ${v}=${!vv}
+			export ${v}="${!vv}"
 		done
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Fabian Groffen (grobian)]

grobian     09/10/08 20:10:56

  Modified:             multilib.eclass
  Log:
  add Prefix compatability

Revision  Changes    Path
1.77                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.76&r2=1.77

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- multilib.eclass	8 Oct 2009 19:56:14 -0000	1.76
+++ multilib.eclass	8 Oct 2009 20:10:56 -0000	1.77
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.76 2009/10/08 19:56:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.77 2009/10/08 20:10:56 grobian Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -477,24 +477,26 @@
 	local dest=$1
 	shift
 	local basedirs=$@
+	[[ -z ${ED} ]] && local ED=${D}
 
 	dodir ${dest}
 
 	local basedir
 	for basedir in ${basedirs}; do
 		local dir
-		for dir in $(find "${D}"/${basedir} -type d); do
-			dodir ${dest}/${dir/${D}\/${basedir}/}
+		for dir in $(find "${ED}"/${basedir} -type d); do
+			dodir ${dest}/${dir/${ED}\/${basedir}/}
 		done
 	done
 }
 
 # Helper function for create_ml_includes
 create_ml_includes-allfiles() {
+	[[ -z ${ED} ]] && local ED=${D}
 	local basedir file
 	for basedir in "$@" ; do
-		for file in $(find "${D}"/${basedir} -type f); do
-			echo ${file/${D}\/${basedir}\//}
+		for file in $(find "${ED}"/${basedir} -type f); do
+			echo ${file/${ED}\/${basedir}\//}
 		done
 	done | sort | uniq
 }

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Fabian Groffen (grobian)]

grobian     09/10/08 19:56:14

  Modified:             multilib.eclass
  Log:
  add get_modname function that retrieves the shared module extension, like get_libname does for shared libraries

Revision  Changes    Path
1.76                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.75&r2=1.76

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- multilib.eclass	8 Oct 2009 19:54:40 -0000	1.75
+++ multilib.eclass	8 Oct 2009 19:56:14 -0000	1.76
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.75 2009/10/08 19:54:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.76 2009/10/08 19:56:14 grobian Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -550,6 +550,26 @@
 	fi
 }
 
+# @FUNCTION: get_modname
+# @USAGE:
+# @DESCRIPTION:
+# Returns modulename with proper suffix {.so,.bundle,etc} for the current
+# platform identified by CHOST.
+#
+# Example:
+#     libfoo$(get_modname)
+#     Returns: libfoo.so (ELF) || libfoo.bundle (MACH) || ...
+get_modname() {
+	local modname
+	local ver=$1
+	case ${CHOST} in
+		*-darwin*)                modname="bundle";;
+		*)                        modname="so";;
+	esac
+
+	echo ".${modname}"
+}
+
 # This is for the toolchain to setup profile variables when pulling in
 # a crosscompiler (and thus they aren't set in the profile)
 multilib_env() {

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Fabian Groffen (grobian)]

grobian     09/10/08 19:54:41

  Modified:             multilib.eclass
  Log:
  add hppa*-hpux support to get_libname

Revision  Changes    Path
1.75                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.74&r2=1.75

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- multilib.eclass	14 Jun 2009 11:40:14 -0000	1.74
+++ multilib.eclass	8 Oct 2009 19:54:40 -0000	1.75
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.74 2009/06/14 11:40:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.75 2009/10/08 19:54:40 grobian Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -532,6 +532,7 @@
 		*-darwin*)                libname="dylib";;
 		*-aix*)                   libname="a";;
 		*-mint*)                  libname="irrelevant";;
+		hppa*-hpux*)              libname="sl";;
 		*)                        libname="so";;
 	esac
 

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Fabian Groffen (grobian)]

grobian     09/06/14 11:40:14

  Modified:             multilib.eclass
  Log:
  first argument is version, not the library name

Revision  Changes    Path
1.74                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.73&r2=1.74

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- multilib.eclass	4 Apr 2009 18:02:33 -0000	1.73
+++ multilib.eclass	14 Jun 2009 11:40:14 -0000	1.74
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.73 2009/04/04 18:02:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.74 2009/06/14 11:40:14 grobian Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -522,8 +522,8 @@
 # supplied version for the current platform identified by CHOST.
 #
 # Example:
-#     get_libname libfoo ${PV}
-#     Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH) || ...
+#     get_libname ${PV}
+#     Returns: .so.${PV} (ELF) || .${PV}.dylib (MACH) || ...
 get_libname() {
 	local libname
 	local ver=$1

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Fabian Groffen (grobian)]

grobian     09/04/04 18:02:33

  Modified:             multilib.eclass
  Log:
  backport fix from Prefix for get_libname to support AIX and FreeMiNT

Revision  Changes    Path
1.73                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.72&r2=1.73

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- multilib.eclass	20 Feb 2009 23:20:22 -0000	1.72
+++ multilib.eclass	4 Apr 2009 18:02:33 -0000	1.73
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.72 2009/02/20 23:20:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.73 2009/04/04 18:02:33 grobian Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -518,18 +518,20 @@
 # @FUNCTION: get_libname
 # @USAGE: [version]
 # @DESCRIPTION:
-# Returns libname with proper suffix {.so,.dylib} and optionally supplied version
-# for ELF/MACH-O shared objects
+# Returns libname with proper suffix {.so,.dylib,.dll,etc} and optionally
+# supplied version for the current platform identified by CHOST.
 #
 # Example:
 #     get_libname libfoo ${PV}
-#     Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
+#     Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH) || ...
 get_libname() {
 	local libname
 	local ver=$1
 	case ${CHOST} in
 		*-cygwin|mingw*|*-mingw*) libname="dll";;
 		*-darwin*)                libname="dylib";;
+		*-aix*)                   libname="a";;
+		*-mint*)                  libname="irrelevant";;
 		*)                        libname="so";;
 	esac
 
@@ -539,6 +541,8 @@
 		for ver in "$@" ; do
 			case ${CHOST} in
 				*-darwin*) echo ".${ver}.${libname}";;
+				*-aix*)    echo ".${libname}";;
+				*-mint*)   echo ".${libname}";;
 				*)         echo ".${libname}.${ver}";;
 			esac
 		done

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      09/02/20 23:20:22

  Modified:             multilib.eclass
  Log:
  set each component explicitly and avoid requiring magic gcc-config behavior

Revision  Changes    Path
1.72                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.71&r2=1.72

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- multilib.eclass	9 Feb 2009 19:53:14 -0000	1.71
+++ multilib.eclass	20 Feb 2009 23:20:22 -0000	1.72
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.71 2009/02/09 19:53:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.72 2009/02/20 23:20:22 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -649,29 +649,34 @@
 # Hide multilib details here for packages which are forced to be compiled for a
 # specific ABI when run on another ABI (like x86-specific packages on amd64)
 multilib_toolchain_setup() {
+	local v vv
+
 	export ABI=$1
 
-	# disable ccache for non-native builds #196243.  this is because how
-	# we cram ABI related CFLAGS behind the back of the gcc frontend with
-	# the gcc-config wrapper.
+	# We want to avoid the behind-the-back magic of gcc-config as it
+	# screws up ccache and distcc.  See #196243 for more info.
 	if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
-		: ${CCACHE_DISABLE:=multilib-disable}
-	else
-		if [[ ${CCACHE_DISABLE} == "multilib-disable" ]] ; then
-			unset CCACHE_DISABLE
+		if [[ ${DEFAULT_ABI_SAVED} != "true" ]] ; then
+			for v in CHOST CBUILD AS CC CXX LD ; do
+				export __abi_saved_${v}="${!v}"
+			done
+			export DEFAULT_ABI_SAVED="true"
 		fi
-	fi
-	export CCACHE_DISABLE
-
-	if has_version app-admin/eselect-compiler ; then
-		# Binutils doesn't have wrappers for ld and as (yet).  Eventually it
-		# will, and all this can just be handled with CHOST.
-		export LD="ld $(get_abi_LDFLAGS $1)"
-		export AS="as $(get_abi_ASFLAGS $1)"
 
+		# Set the CHOST native first so that we pick up the native
+		# toolchain and not a cross-compiler by accident #202811.
+		export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
+		export AS="$(tc-getAS) $(get_abi_ASFLAGS)"
+		export CC="$(tc-getCC) $(get_abi_CFLAGS)"
+		export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
+		export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
 		export CHOST=$(get_abi_CHOST $1)
 		export CBUILD=$(get_abi_CHOST $1)
-	else
-		tc-export CC
+
+	elif [[ ${DEFAULT_ABI_SAVED} == "true" ]] ; then
+		for v in CHOST CBUILD AS CC CXX LD ; do
+			vv="__abi_saved_${v}"
+			export ${v}=${!vv}
+		done
 	fi
 }

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Markus Meier (maekke)]

maekke      09/02/09 19:53:14

  Modified:             multilib.eclass
  Log:
  quote some vars, bug #258214

Revision  Changes    Path
1.71                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.70&r2=1.71

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- multilib.eclass	9 Jan 2009 06:59:45 -0000	1.70
+++ multilib.eclass	9 Feb 2009 19:53:14 -0000	1.71
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.70 2009/01/09 06:59:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.71 2009/02/09 19:53:14 maekke Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -339,7 +339,7 @@
 		if is_final_abi; then
 			base=${T}/gentoo-multilib
 			pushd "${base}"
-			find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
+			find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C "${D}"
 			popd
 
 			# This 'set' stuff is required by mips profiles to properly pass
@@ -483,7 +483,7 @@
 	local basedir
 	for basedir in ${basedirs}; do
 		local dir
-		for dir in $(find ${D}/${basedir} -type d); do
+		for dir in $(find "${D}"/${basedir} -type d); do
 			dodir ${dest}/${dir/${D}\/${basedir}/}
 		done
 	done

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      09/01/09 06:59:45

  Modified:             multilib.eclass
  Log:
  disable ccache when selecting a multilib other than the default #196243

Revision  Changes    Path
1.70                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.69&r2=1.70

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- multilib.eclass	28 Nov 2008 09:20:26 -0000	1.69
+++ multilib.eclass	9 Jan 2009 06:59:45 -0000	1.70
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.69 2008/11/28 09:20:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.70 2009/01/09 06:59:45 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -651,6 +651,18 @@
 multilib_toolchain_setup() {
 	export ABI=$1
 
+	# disable ccache for non-native builds #196243.  this is because how
+	# we cram ABI related CFLAGS behind the back of the gcc frontend with
+	# the gcc-config wrapper.
+	if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
+		: ${CCACHE_DISABLE:=multilib-disable}
+	else
+		if [[ ${CCACHE_DISABLE} == "multilib-disable" ]] ; then
+			unset CCACHE_DISABLE
+		fi
+	fi
+	export CCACHE_DISABLE
+
 	if has_version app-admin/eselect-compiler ; then
 		# Binutils doesn't have wrappers for ld and as (yet).  Eventually it
 		# will, and all this can just be handled with CHOST.

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      08/11/28 09:20:27

  Modified:             multilib.eclass
  Log:
  tweak cygwin target

Revision  Changes    Path
1.69                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.68&r2=1.69

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- multilib.eclass	28 Nov 2008 06:31:30 -0000	1.68
+++ multilib.eclass	28 Nov 2008 09:20:26 -0000	1.69
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.68 2008/11/28 06:31:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.69 2008/11/28 09:20:26 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -528,9 +528,9 @@
 	local libname
 	local ver=$1
 	case ${CHOST} in
-		cygwin|mingw*|*-mingw*) libname="dll";;
-		*-darwin*)              libname="dylib";;
-		*)                      libname="so";;
+		*-cygwin|mingw*|*-mingw*) libname="dll";;
+		*-darwin*)                libname="dylib";;
+		*)                        libname="so";;
 	esac
 
 	if [[ -z $* ]] ; then

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      08/11/28 06:31:30

  Modified:             multilib.eclass
  Log:
  cygwin targets produce dlls

Revision  Changes    Path
1.68                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.67&r2=1.68

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- multilib.eclass	22 Jun 2008 13:57:42 -0000	1.67
+++ multilib.eclass	28 Nov 2008 06:31:30 -0000	1.68
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.67 2008/06/22 13:57:42 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.68 2008/11/28 06:31:30 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -528,9 +528,9 @@
 	local libname
 	local ver=$1
 	case ${CHOST} in
-		mingw*|*-mingw*) libname="dll";;
-		*-darwin*)       libname="dylib";;
-		*)               libname="so";;
+		cygwin|mingw*|*-mingw*) libname="dll";;
+		*-darwin*)              libname="dylib";;
+		*)                      libname="so";;
 	esac
 
 	if [[ -z $* ]] ; then

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      08/06/01 01:38:09

  Modified:             multilib.eclass
  Log:
  remove old docs as well

Revision  Changes    Path
1.66                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.65&r2=1.66

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- multilib.eclass	1 Jun 2008 01:37:29 -0000	1.65
+++ multilib.eclass	1 Jun 2008 01:38:09 -0000	1.66
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.65 2008/06/01 01:37:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.66 2008/06/01 01:38:09 vapier Exp $
 
 # @ECLASS: multilib.eclass
 # @MAINTAINER:
@@ -13,84 +13,6 @@
 ___ECLASS_RECUR_MULTILIB="yes"
 [[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
 
-# is_final_abi:
-# Return true if ${ABI} is the final abi to be installed (and thus we are
-# on our last run through a src_* function.
-
-# number_abis:
-# echo the number of ABIs we will be installing for
-
-# get_install_abis:
-# Return a list of the ABIs we want to install for with
-# the last one in the list being the default.
-
-# get_all_abis:
-# Return a list of the ABIs supported by this profile.
-# the last one in the list being the default.
-
-# get_all_libdirs:
-# Returns a list of all the libdirs used by this profile.  This includes
-# those that might not be touched by the current ebuild and always includes
-# "lib".
-
-# get_libdir:
-# Returns the libdir for the selected ABI.  This is backwards compatible
-# and simply calls get_abi_LIBDIR() on newer profiles.  You should use this
-# to determine where to install shared objects (ex: /usr/$(get_libdir))
-
-# get_abi_var <VAR> [<ABI>]:
-# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
-#
-# get_abi_CFLAGS:
-# get_abi_CDEFINE:
-# get_abi_LIBDIR:
-# Aliases for 'get_abi_var CFLAGS', etc.
-
-# get_ml_incdir [<include dir> [<ABI>]]
-# include dir defaults to /usr/include
-# ABI defaults to ${ABI} or ${DEFAULT_ABI}
-#
-# If a multilib include dir is associated with the passed include dir, then
-# we return it, otherwise, we just echo back the include dir.  This is
-# neccessary when a built script greps header files rather than testing them
-# via #include (like perl) to figure out features.
-
-# prep_ml_includes:
-# Some includes (include/asm, glibc, etc) are ABI dependent.  In this case,
-# We can install them in different locations for each ABI and create a common
-# header which includes the right one based on CDEFINE_${ABI}.  If your
-# package installs ABI-specific headers, just add 'prep_ml_includes' to the
-# end of your src_install().  It takes a list of directories that include
-# files are installed in (default is /usr/include if none are passed).
-#
-# Example:
-# src_install() {
-#    ...
-#    prep_ml_includes /usr/qt/3/include
-# }
-
-# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
-# If you need more control than prep_ml_includes can offer (like linux-headers
-# for the asm-* dirs, then use create_ml_includes.  The firs argument is the
-# common dir.  The remaining args are of the form <symbol>:<dir> where
-# <symbol> is what is put in the #ifdef for choosing that dir.
-#
-# Ideas for this code came from debian's sparc-linux headers package.
-#
-# Example:
-# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
-# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
-
-# get_libname [version]
-# returns libname with proper suffix {.so,.dylib} and optionally supplied version
-# for ELF/MACH-O shared objects
-#
-# Example:
-# get_libname libfoo ${PV}
-# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
-
-### END DOCUMENTATION ###
-
 # Defaults:
 export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
 export DEFAULT_ABI=${DEFAULT_ABI:-"default"}



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      08/06/01 01:37:30

  Modified:             multilib.eclass
  Log:
  add eclass documentation by mren #210521

Revision  Changes    Path
1.65                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.64&r2=1.65

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- multilib.eclass	2 May 2008 04:07:38 -0000	1.64
+++ multilib.eclass	1 Jun 2008 01:37:29 -0000	1.65
@@ -1,21 +1,18 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.64 2008/05/02 04:07:38 vapier Exp $
-#
-# Maintainer: amd64@gentoo.org / toolchain@gentoo.org
-#
-# This eclass is for all functions pertaining to handling multilib.
-# configurations.
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.65 2008/06/01 01:37:29 vapier Exp $
+
+# @ECLASS: multilib.eclass
+# @MAINTAINER:
+# amd64@gentoo.org
+# toolchain@gentoo.org
+# @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
+# @DESCRIPTION:
+# This eclass is for all functions pertaining to handling multilib configurations.
 
 ___ECLASS_RECUR_MULTILIB="yes"
 [[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
 
-# has_multilib_profile:
-# Return true if the current profile is a multilib profile and lists more than
-# one abi in ${MULTILIB_ABIS}.  When has_multilib_profile returns true, that
-# profile should enable the 'multilib' use flag. This is so you can DEPEND on
-# a package only for multilib or not multilib.
-
 # is_final_abi:
 # Return true if ${ABI} is the final abi to be installed (and thus we are
 # on our last run through a src_* function.
@@ -105,19 +102,25 @@
 export CDEFINE_default="__unix__"
 export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
 
-# has_multilib_profile()
+# @FUNCTION: has_multilib_profile
+# @DESCRIPTION:
+# Return true if the current profile is a multilib profile and lists more than
+# one abi in ${MULTILIB_ABIS}.  When has_multilib_profile returns true, that
+# profile should enable the 'multilib' use flag. This is so you can DEPEND on
+# a package only for multilib or not multilib.
 has_multilib_profile() {
 	[ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
 }
 
+# @FUNCTION: get_libdir
+# @RETURN: the libdir for the selected ABI
+# @DESCRIPTION:
 # This function simply returns the desired lib directory. With portage
 # 2.0.51, we now have support for installing libraries to lib32/lib64
 # to accomidate the needs of multilib systems. It's no longer a good idea
 # to assume all libraries will end up in lib. Replace any (sane) instances
 # where lib is named directly with $(get_libdir) if possible.
 #
-# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
-#
 # Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
 #   Added support for ${ABI} and ${DEFAULT_ABI}.  If they're both not set,
 #   fall back on old behavior.  Any profile that has these set should also
@@ -133,6 +136,8 @@
 	fi
 }
 
+# @FUNCTION: get_multilibdir
+# @RETURN: Returns the multilibdir
 get_multilibdir() {
 	if has_multilib_profile; then
 		eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach.  Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
@@ -141,6 +146,8 @@
 	echo ${CONF_MULTILIBDIR:=lib32}
 }
 
+# @FUNCTION: get_libdir_override
+# @DESCRIPTION:
 # Sometimes you need to override the value returned by get_libdir. A good
 # example of this is xorg-x11, where lib32 isnt a supported configuration,
 # and where lib64 -must- be used on amd64 (for applications that need lib
@@ -150,8 +157,6 @@
 # return:
 #
 #   get_libdir_override lib64
-#
-# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
 get_libdir_override() {
 	if has_multilib_profile; then
 		eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach.  Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
@@ -162,9 +167,10 @@
 	LIBDIR_default="$1"
 }
 
-# get_abi_var <VAR> [<ABI>]
-# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
-#
+# @FUNCTION: get_abi_var
+# @USAGE: <VAR> [ABI]
+# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
+# @DESCRIPTION:
 # ex:
 # CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
 #
@@ -174,8 +180,6 @@
 # If <ABI> is not specified, ${ABI} is used.
 # If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
 # If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
-#
-# Jeremy Huddleston <eradicator@gentoo.org>
 get_abi_var() {
 	local flag=$1
 	local abi
@@ -193,15 +197,56 @@
 	echo ${!var}
 }
 
+# @FUNCTION: get_abi_CFLAGS
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var CFLAGS'
 get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
+
+# @FUNCTION: get_abi_ASFLAGS
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var ASFLAGS'
 get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; }
+
+# @FUNCTION: get_abi_LDFLAGS
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var LDFLAGS'
 get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
+
+# @FUNCTION: get_abi_CHOST
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var CHOST'
 get_abi_CHOST() { get_abi_var CHOST "$@"; }
+
+# @FUNCTION: get_abi_CTARGET
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var CTARGET'
 get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
+
+# @FUNCTION: get_abi_FAKE_TARGETS
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var FAKE_TARGETS'
 get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
+
+# @FUNCTION: get_abi_CDEFINE
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var CDEFINE'
 get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
+
+# @FUNCTION: get_abi_LIBDIR
+# @USAGE: [ABI]
+# @DESCRIPTION:
+# Alias for 'get_abi_var LIBDIR'
 get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
 
+# @FUNCTION: get_install_abis
+# @DESCRIPTION:
 # Return a list of the ABIs we want to install for with
 # the last one in the list being the default.
 get_install_abis() {
@@ -241,6 +286,8 @@
 	return 0
 }
 
+# @FUNCTION: get_all_abis
+# @DESCRIPTION: 
 # Return a list of the ABIs supported by this profile.
 # the last one in the list being the default.
 get_all_abis() {
@@ -262,9 +309,11 @@
 	return 0
 }
 
-# get_all_libdirs()
+# @FUNCTION: get_all_libdirs
+# @DESCRIPTION:
 # Returns a list of all the libdirs used by this profile.  This includes
-# those that might not be touched by the current ebuild.
+# those that might not be touched by the current ebuild and always includes
+# "lib".
 get_all_libdirs() {
 	local libdirs="lib"
 	local abi
@@ -277,6 +326,8 @@
 	echo "${libdirs}"
 }
 
+# @FUNCTION: is_final_abi
+# @DESCRIPTION:
 # Return true if ${ABI} is the last ABI on our list (or if we're not
 # using the new multilib configuration.  This can be used to determine
 # if we're in the last (or only) run through src_{unpack,compile,install}
@@ -287,14 +338,23 @@
 	[[ ${LAST_ABI} == ${ABI} ]]
 }
 
+# @FUNCTION: number_abis
+# @DESCRIPTION:
 # echo the number of ABIs we will be installing for
 number_abis() {
 	get_install_abis | wc -w
 }
 
-# get_ml_incdir [<include dir> [<ABI>]]
+# @FUNCTION: get_ml_incdir
+# @USAGE: [include_dir] [ABI]
+# @DESCRIPTION:
 # include dir defaults to /usr/include
 # ABI defaults to ${ABI} or ${DEFAULT_ABI}
+#
+# If a multilib include dir is associated with the passed include dir, then
+# we return it, otherwise, we just echo back the include dir.  This is
+# neccessary when a built script greps header files rather than testing them
+# via #include (like perl) to figure out features.
 get_ml_incdir() {
 	local dir=/usr/include
 
@@ -321,8 +381,8 @@
 	fi
 }
 
-# prep_ml_includes:
-#
+# @FUNCTION: prep_ml_includes
+# @DESCRIPTION:
 # Some includes (include/asm, glibc, etc) are ABI dependent.  In this case,
 # We can install them in different locations for each ABI and create a common
 # header which includes the right one based on CDEFINE_${ABI}.  If your
@@ -331,11 +391,10 @@
 # files are installed in (default is /usr/include if none are passed).
 #
 # Example:
-# src_install() {
-#    ...
-#    prep_ml_includes /usr/qt/3/include
-# }
-
+#     src_install() {
+#        ...
+#        prep_ml_includes /usr/qt/3/include
+#     }
 prep_ml_includes() {
 	if [[ $(number_abis) -gt 1 ]] ; then
 		local dir
@@ -376,6 +435,9 @@
 	fi
 }
 
+# @FUNCTION: create_ml_includes
+# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
+# @DESCRIPTION:
 # If you need more control than prep_ml_includes can offer (like linux-headers
 # for the asm-* dirs, then use create_ml_includes.  The firs argument is the
 # common dir.  The remaining args are of the form <symbol>:<dir> where
@@ -384,8 +446,8 @@
 # Ideas for this code came from debian's sparc-linux headers package.
 #
 # Example:
-# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
-# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
+#     create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
+#     create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
 #
 # Warning: Be careful with the ordering here. The default ABI has to be the
 # last, because it is always defined (by GCC)
@@ -531,6 +593,15 @@
 	exit 1
 }
 
+# @FUNCTION: get_libname
+# @USAGE: [version]
+# @DESCRIPTION:
+# Returns libname with proper suffix {.so,.dylib} and optionally supplied version
+# for ELF/MACH-O shared objects
+#
+# Example:
+#     get_libname libfoo ${PV}
+#     Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
 get_libname() {
 	local libname
 	local ver=$1
@@ -651,6 +722,8 @@
 	esac
 }
 
+# @FUNCTION: multilib_toolchain_setup
+# @DESCRIPTION:
 # Hide multilib details here for packages which are forced to be compiled for a
 # specific ABI when run on another ABI (like x86-specific packages on amd64)
 multilib_toolchain_setup() {



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass

[Mike Frysinger (vapier)]

vapier      08/05/02 04:07:38

  Modified:             multilib.eclass
  Log:
  add .dll to the fugly list

Revision  Changes    Path
1.64                 eclass/multilib.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/multilib.eclass?r1=1.63&r2=1.64

Index: multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- multilib.eclass	1 Jul 2007 23:14:58 -0000	1.63
+++ multilib.eclass	2 May 2008 04:07:38 -0000	1.64
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.63 2007/07/01 23:14:58 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.64 2008/05/02 04:07:38 vapier Exp $
 #
 # Maintainer: amd64@gentoo.org / toolchain@gentoo.org
 #
@@ -535,11 +535,12 @@
 	local libname
 	local ver=$1
 	case ${CHOST} in
-		*-darwin*) libname="dylib";;
-		*)         libname="so";;
+		mingw*|*-mingw*) libname="dll";;
+		*-darwin*)       libname="dylib";;
+		*)               libname="so";;
 	esac
 
-	if [[ -z $@ ]] ; then
+	if [[ -z $* ]] ; then
 		echo ".${libname}"
 	else
 		for ver in "$@" ; do



-- 
gentoo-commits@lists.gentoo.org mailing list