Cleaned up 1.4.0 a bit. Got rid of the stupid fake-ctarget.sh stuff and added smarter logic for that into the gcc-config script. Still in package.mask as it hits a sandbox bug.

Package-Manager: portage-2.0.51.18

5 files changed, 43 insertions, 33 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index e0a6976c0dd5..9baf21de0f35 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.81 2005/02/19 10:04:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.82 2005/03/04 12:22:21 eradicator Exp $
+
+  04 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/fake-ctarget.sh, files/gcc-config-1.4.0, gcc-config-1.4.0.ebuild:
+  Cleaned up 1.4.0 a bit. Got rid of the stupid fake-ctarget.sh stuff and
+  added smarter logic for that into the gcc-config script. Still in
+  package.mask as it hits a sandbox bug.
 
 *gcc-config-1.4.0 (19 Feb 2005)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index e38e6d6d4e9a..9e708ee30663 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -3,23 +3,22 @@ Hash: SHA1
 
 MD5 012868b502a874cc4f1abfa862bafb8a gcc-config-1.3.8-r4.ebuild 1429
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 dfc5ae419559377dff82dc06b1cdb677 ChangeLog 16651
+MD5 4e826fff485073b297f5bb7f4119f0e9 ChangeLog 16967
 MD5 59fe9b0a4eab7247d332cf0ca73874c4 gcc-config-1.3.10-r1.ebuild 1451
-MD5 8f3acf59440d9f597b6dd8386af66ebb gcc-config-1.4.0.ebuild 1945
+MD5 856d159682acb2dca11e43b8bbe42b70 gcc-config-1.4.0.ebuild 1896
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r4 0
 MD5 396974306d3ccab6db5354d94ffd21fd files/gcc-config-1.3.8 12498
 MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545
 MD5 ee3f55895cd7d8bc97f6903961a5491b files/wrapper-1.4.5.c 10671
 MD5 3d37d08bd6d1d828ea19572c0c381032 files/gcc-config-1.3.10 13233
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.10-r1 0
-MD5 4d98880cd4c884130e0d3a7ee59c9691 files/gcc-config-1.4.0 14620
+MD5 c8978d8b4ce338ba022d4bc8f4935d12 files/gcc-config-1.4.0 14551
 MD5 b896b5ba2fa0766e410adf13ecc8048e files/wrapper-1.4.6.c 10526
-MD5 d3cceaad0e9b9d7f544d792ba493909a files/fake-ctarget.sh 82
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.4.0 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCF+UiArHZZzCEUG0RAlUOAJkBAWQowF2lj/jvxSh3Ibfzi51NcwCeLBci
-9PE5Ej04ZCMFICvjbDpI82A=
-=uDmi
+iD8DBQFCKFMIArHZZzCEUG0RAhayAJ467HPrHLKF0iQP/AYG5aFrGPCR5gCeLhFA
+jr9NfsGC+A0Wc+u7LchzAp0=
+=tl1j
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/fake-ctarget.sh b/sys-devel/gcc-config/files/fake-ctarget.sh
deleted file mode 100644
index 624156951540..000000000000
--- a/sys-devel/gcc-config/files/fake-ctarget.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export ABI="custom"
-export CFLAGS_custom="@@CFLAGS@@"
-@@EXEC@@ "${@}"
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0
index 06fdce677641..400573b19b1c 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.4.0
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.0
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.2 2005/02/20 01:16:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.3 2005/03/04 12:22:21 eradicator Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -92,6 +92,21 @@ is_cross_compiler() {
 	[[ ${CC_COMP/${REAL_CHOST}} = ${CC_COMP} ]]
 }
 
+create_script_wrapper() {
+	cat > ${1} <<EOF
+#!/bin/bash
+
+if [[ -z \${ABI} ]]; then
+	export ABI="custom"
+	export CFLAGS_custom="${3}"
+fi
+
+${2} "\${@}"
+EOF
+
+	chmod 755 ${1}
+}
+
 switch_profile() {
 	local MY_LDPATH=
 	local GCC_PROFILES=
@@ -211,7 +226,7 @@ switch_profile() {
 		local ref=${ROOT}/${GCC_BIN_PATH}/${x}
 		[[ ${x} = "cc" ]] && ref=${ROOT}/${GCC_BIN_PATH}/gcc
 		if [[ -x ${ref} ]] ; then
-			${CP} -f "${LIBEXECDIR}/wrapper" \
+			${CP} -f "${WRAPPER}" \
 			         "${ROOT}/usr/bin/${x}"
 			touch -r "${ref}" "${ROOT}/usr/bin/${x}"
 
@@ -219,7 +234,7 @@ switch_profile() {
 			# This should probably get folded back into the wrapper ...
 			if [[ ${x:${#x}-3} = "gcc" ]] || [[ ${x:${#x}-3} = "g++" ]] ; then
 				for bits in ${GCCBITS} ; do
-					cp -f "${LIBEXECDIR}/wrapper" \
+					cp -f "${WRAPPER}" \
 						"${ROOT}/usr/bin/${x}${bits}"
 				done
 			fi
@@ -236,7 +251,7 @@ switch_profile() {
 			[[ -f ${ROOT}/usr/bin/${CTARGET}-${x}64 ]] && \
 				rm -f ${ROOT}/usr/bin/${CTARGET}-${x}64
 
-			${CP} -f ${LIBEXECDIR}/wrapper \
+			${CP} -f ${WRAPPER} \
 				${ROOT}/usr/bin/${CTARGET}-${x}
 			${CHMOD} 755 ${ROOT}/usr/bin/${CTARGET}-${x}
 			touch -r ${ref} ${ROOT}/usr/bin/${CTARGET}-${x}
@@ -245,19 +260,13 @@ switch_profile() {
 			for cctarget in ${CTARGET_ALIASES}; do
 				local var="CFLAGS_"${cctarget//-/_}
 				if [[ ! -f ${GCC_ENV_D}/config-${cctarget} ]]; then
-					sed -e "s:@@EXEC@@:${CTARGET}-${x}:g" \
-					    -e "s:@@CFLAGS@@:${!var}:g" \
-					    ${LIBEXECDIR}/fake-ctarget.sh > ${ROOT}/usr/bin/${cctarget}-${x}
-					${CHMOD} 755 ${ROOT}/usr/bin/${cctarget}-${x}
+					create_script_wrapper ${ROOT}/usr/bin/${cctarget}-${x} ${CTARGET}-${x} "${!var}"
 					touch -r ${ref} ${ROOT}/usr/bin/${cctarget}-${x}
 				fi
 			done
 
 			if ! is_cross_compiler && [[ -n "${CFLAGS_default}" ]]; then
-				sed -e "s:@@EXEC@@:${CTARGET}-${x}:g" \
-				    -e "s:@@CFLAGS@@:${CFLAGS_default}:g" \
-				    ${LIBEXECDIR}/fake-ctarget.sh > ${ROOT}/usr/bin/${x}
-				${CHMOD} 755 ${ROOT}/usr/bin/${x}
+				create_script_wrapper ${ROOT}/usr/bin/${x} ${CTARGET}-${x} "${CFLAGS_default}"
 				touch -r ${ref} ${ROOT}/usr/bin/${x}
 			fi
 		fi
@@ -266,7 +275,7 @@ switch_profile() {
 	# Only install cpp if switching to a native one
 	if ! is_cross_compiler ; then
 		${RM} -f "${ROOT}/lib/cpp"
-		${CP} -f "${LIBEXECDIR}/wrapper" "${ROOT}/lib/cpp"
+		${CP} -f "${WRAPPER}" "${ROOT}/lib/cpp"
 	fi
 
 	# We need to make sure that libgcc_s.so makes it into /lib.
@@ -419,7 +428,8 @@ CHECK_CHOST="no"
 CC_COMP=
 [[ -z ${ROOT} ]] && ROOT="/"
 [[ ${ROOT:-1} != "/" ]] && ROOT="${ROOT}/"
-LIBEXECDIR="${ROOT}usr/lib/misc/gcc-config"
+LIBEXECDIR="${ROOT}usr/lib/misc"
+WRAPPER="${LIBEXECDIR}/gcc-config-wrapper"
 ENV_D="${ROOT}etc/env.d"
 GCC_ENV_D="${ENV_D}/gcc"
 
diff --git a/sys-devel/gcc-config/gcc-config-1.4.0.ebuild b/sys-devel/gcc-config/gcc-config-1.4.0.ebuild
index dc646327cdbe..b5598c870e2e 100644
--- a/sys-devel/gcc-config/gcc-config-1.4.0.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.0.ebuild,v 1.1 2005/02/19 10:04:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.4.0.ebuild,v 1.2 2005/03/04 12:22:21 eradicator Exp $
 
 inherit toolchain-funcs
 
@@ -13,8 +13,8 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+#KEYWORDS="-*"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 #KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
@@ -24,7 +24,7 @@ DEPEND="virtual/libc
 S=${WORKDIR}
 
 src_compile() {
-	$(tc-getCC) -O2 -Wall -o wrapper \
+	$(tc-getCC) -O2 -Wall -o gcc-config-wrapper \
 		${FILESDIR}/wrapper-${W_VER}.c || die "compile wrapper"
 }
 
@@ -32,9 +32,8 @@ src_install() {
 	newbin ${FILESDIR}/${PN}-${PV} ${PN} || die "install gcc-config"
 	dosed "s:PORTAGE-VERSION:${PVR}:" /usr/bin/${PN}
 
-	exeinto /usr/lib/misc/gcc-config
-	doexe wrapper || die "install wrapper"
-	doexe ${FILESDIR}/fake-ctarget.sh || die "install wrapper"
+	exeinto /usr/lib/misc
+	doexe gcc-config-wrapper || die "install wrapper"
 }
 
 pkg_postinst() {