Export the NOSTDINC_FLAGS to ensure -nostdlib is passed, bug #120678.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 213 insertions, 7 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 6b7f4b273d9e..3faf21b16d93 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.19 2006/02/04 08:57:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.20 2006/02/07 08:33:22 azarah Exp $
+
+*klibc-1.2.1-r1 (07 Feb 2006)
+
+  07 Feb 2006; Martin Schlemmer <azarah@gentoo.org>
+  +files/klibc-1.2.1-nostdinc-flags.patch, +klibc-1.2.1-r1.ebuild:
+  Export the NOSTDINC_FLAGS to ensure -nostdlib is passed, bug #120678.
 
 *klibc-1.2.1 (04 Feb 2006)
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 3ee96eeba94e..813087682822 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f349181e2cd46dbd2ca3dbe1648c2d52 ChangeLog 3161
-RMD160 137587f24f9bf07b8857960c27c15c1e10c12286 ChangeLog 3161
-SHA256 2af41d1902899cc849400fc3ac391ba75870f714ac9b5ea1cd55cbfe9f028806 ChangeLog 3161
+MD5 4bbd333bbbfa22877a65cfb452d3d57f ChangeLog 3384
+RMD160 de257be775704269cda4bb0710e4da58da0e15a0 ChangeLog 3384
+SHA256 f33b71795c65e5387bc0a8187caa64283dd0054d683f6ebc7ca164e3289add1a ChangeLog 3384
 MD5 5f74818fe6743d6f26cd199480a6d4ea files/digest-klibc-1.0.14-r1 65
 RMD160 9f35187a056704d0ae89ecc0984dbad7ba757fc3 files/digest-klibc-1.0.14-r1 65
 SHA256 d6e84fe0d96310d4a3ba58d5b1e1d7ed06086082d203846f1e4e3633afbfceb6 files/digest-klibc-1.0.14-r1 65
@@ -22,6 +22,9 @@ SHA256 bd43dc46dc8a74dd097f3e1373a013124dc643a05ec1bdabaaeec8dcd1c91546 files/di
 MD5 e2c54f1b35309be367759ba42ef5027b files/digest-klibc-1.2.1 238
 RMD160 19cd909eb9419c8aa5c0e829dab15f8783188ae2 files/digest-klibc-1.2.1 238
 SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/digest-klibc-1.2.1 238
+MD5 e2c54f1b35309be367759ba42ef5027b files/digest-klibc-1.2.1-r1 238
+RMD160 19cd909eb9419c8aa5c0e829dab15f8783188ae2 files/digest-klibc-1.2.1-r1 238
+SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/digest-klibc-1.2.1-r1 238
 MD5 4b098438d57b0f7ad9f16d534fb98eb4 files/klibc-1.0.14-nostdlib.patch 460
 RMD160 b7cf757792d33d93763f80599f7c09b81be527f3 files/klibc-1.0.14-nostdlib.patch 460
 SHA256 9f33b172b3d1d71f4f23459af6e6169ce97070d1bcd81833c6e4e70fe39f1b58 files/klibc-1.0.14-nostdlib.patch 460
@@ -34,6 +37,9 @@ SHA256 25c65f443351fbdb59584a5867f6610c2f7fd722d2186089917568b23229d65c files/kl
 MD5 bc6971ccb91f090d38a5490d630d8973 files/klibc-1.1.16-mips32.patch 711
 RMD160 334e971cb4f31e89862b6bfdbbe54ae7c59b1478 files/klibc-1.1.16-mips32.patch 711
 SHA256 b46340b0e1abb7284f2ef84724cdbffd52c760c71d2fe00f05d35065c372ae91 files/klibc-1.1.16-mips32.patch 711
+MD5 61fb70164eba62770ed5c9d094c4528d files/klibc-1.2.1-nostdinc-flags.patch 1107
+RMD160 ed4892fef55eba29608a4173be64272e053432a8 files/klibc-1.2.1-nostdinc-flags.patch 1107
+SHA256 cff748eebde1405c76832b9f6f363101286ebbb741f6fb21423965539d660cfe files/klibc-1.2.1-nostdinc-flags.patch 1107
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 files/klibc.m4 3619
 SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 files/klibc.m4 3619
@@ -52,6 +58,9 @@ SHA256 7ba6f473e6ee67d8843a2fd0a460ce67d0b75bb7c7cfacf92b4592658b202ed3 klibc-1.
 MD5 8aeec3288335b9aa00b16bf2c0ae45b6 klibc-1.1.ebuild 4165
 RMD160 322fb2a8bab3b1240ed44831507691be457677d0 klibc-1.1.ebuild 4165
 SHA256 94ef3179da75c07c197c830e644520b0032b0493601d8c3ee217f81d6f124230 klibc-1.1.ebuild 4165
+MD5 4f95e9961eb6f28b15b6164f64e79957 klibc-1.2.1-r1.ebuild 4398
+RMD160 e0feb9fff11c9744eabe75d15dfb454882da5ece klibc-1.2.1-r1.ebuild 4398
+SHA256 d880ea02cd3fbb2fdd4ee554c85309be694de89143177b2f5fb05f58102ae9cf klibc-1.2.1-r1.ebuild 4398
 MD5 631b5cb4d1ec609f7d3ed03228a596ec klibc-1.2.1.ebuild 4276
 RMD160 30d3aec718ff2592c51c76379e0db0a25c19d78f klibc-1.2.1.ebuild 4276
 SHA256 f19fb668f2571cfb447475c7c9a22c294eb3c494b558d684b33dc2e8bad2a9da klibc-1.2.1.ebuild 4276
@@ -61,7 +70,7 @@ SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5Gzu1ZcsMnZjRyIRAu2JAKCrh1o/cXFScYJvbX2IdbUz1zaSeQCfeNHl
-nnB9KbOKywY1qLCfMlMi6Sg=
-=iafB
+iD8DBQFD6Fvd1ZcsMnZjRyIRAiQsAJ9MRRj0MBu2RY/09nFaOFJLEt9BmQCfX2ek
+uFbW4nhWEoF6MdTuRmR3RHQ=
+=rwL/
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/digest-klibc-1.2.1-r1 b/dev-libs/klibc/files/digest-klibc-1.2.1-r1
new file mode 100644
index 000000000000..b6bfd214458f
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.2.1-r1
@@ -0,0 +1,3 @@
+MD5 d5ce19f5df32e7f4f5bbb4562d0573be klibc-1.2.1.tar.bz2 451620
+RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d klibc-1.2.1.tar.bz2 451620
+SHA256 c413b565ea6bd33d4f0af5ee3319d9bc1d804e5cb859b9f3284cad2c449d7c5c klibc-1.2.1.tar.bz2 451620
diff --git a/dev-libs/klibc/files/klibc-1.2.1-nostdinc-flags.patch b/dev-libs/klibc/files/klibc-1.2.1-nostdinc-flags.patch
new file mode 100644
index 000000000000..acdbcb6f4c84
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.2.1-nostdinc-flags.patch
@@ -0,0 +1,22 @@
+--- klibc-1.2.1/Makefile	2006-02-07 10:14:05.000000000 +0200
++++ klibc-1.2.1.az/Makefile	2006-02-07 10:14:11.000000000 +0200
+@@ -12,7 +12,7 @@
+ include scripts/Kbuild.include
+ 
+ export CC      := gcc
+-NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include)
++export NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+ 
+ export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ 
+--- klibc-1.2.1/klcc/Kbuild	2006-02-07 10:26:11.000000000 +0200
++++ klibc-1.2.1.az/klcc/Kbuild	2006-02-07 10:28:16.000000000 +0200
+@@ -14,7 +14,7 @@
+ 	$(Q)echo 'KCROSS=$(KCROSS)' >> $@
+ 	$(Q)echo 'CC=$(KLIBCCC)' >> $@
+ 	$(Q)echo 'LD=$(KLIBCLD)' >> $@
+-	$(Q)echo 'REQFLAGS=$(filter-out -I%,$(KLIBCDEFS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS))' >> $@
++	$(Q)echo 'REQFLAGS=$(NOSTDINC_FLAGS) $(filter-out -I%,$(KLIBCDEFS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS))' >> $@
+ 	$(Q)echo 'OPTFLAGS=$(KLIBCOPTFLAGS)' >> $@
+ 	$(Q)echo 'LDFLAGS=$(KLIBCLDFLAGS)' >> $@
+ 	$(Q)echo 'STRIP=$(KLIBCSTRIP)' >> $@
diff --git a/dev-libs/klibc/klibc-1.2.1-r1.ebuild b/dev-libs/klibc/klibc-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..1d270a381eec
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.2.1-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.2.1-r1.ebuild,v 1.1 2006/02/07 08:33:22 azarah Exp $
+
+inherit eutils linux-mod
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+DESCRIPTION="A minimal libc subset for use with initramfs."
+HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
+	ftp://ftp.kernel.org/pub/linux/libs/klibc/Stable/${P}.tar.bz2
+	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2"
+LICENSE="|| ( GPL-2 LGPL-2 )"
+# Mips patches needs updating ...
+KEYWORDS="~amd64 -mips ~ppc ~x86"
+IUSE="n32"
+RESTRICT="nostrip"
+
+DEPEND="dev-lang/perl
+	virtual/linux-sources"
+RDEPEND="dev-lang/perl"
+
+if [[ ${CTARGET} != ${CHOST} ]] ; then
+	SLOT="${CTARGET}"
+else
+	SLOT="0"
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+guess_arch() {
+	local x
+	local host=$(echo "${CTARGET%%-*}" | sed -e 's/i.86/i386/' \
+	                                         -e 's/sun4u/sparc64/' \
+	                                         -e 's/arm.*/arm/' \
+	                                         -e 's/sa110/arm/' \
+	                                         -e 's/powerpc/ppc/')
+
+	# Sort reverse so that we will get ppc64 before ppc, etc
+	for x in $(ls -1 "${S}/include/arch/" | sort -r) ; do
+		if [[ ${host} == "${x}" ]] ; then
+			echo "${x}"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_setup() {
+	# Make sure kernel sources are OK
+	# (Override for linux-mod eclass)
+	check_kernel_built
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if [[ ! -d /usr/${CTARGET} ]] ; then
+		echo
+		eerror "It does not look like your cross-compiler is setup properly!"
+		die "It does not look like your cross-compiler is setup properly!"
+	fi
+
+	if ! guess_arch &>/dev/null ; then
+		echo
+		eerror "Could not guess klibc's ARCH from your CTARGET!"
+		die "Could not guess klibc's ARCH from your CTARGET!"
+	fi
+
+	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::')
+	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
+		echo
+		eerror "Your kernel sources are not configured for your chosen arch!"
+		eerror "(KERNEL_ARCH=\"${kernel_arch}\", ARCH=\"$(guess_arch)\")"
+		die "Your kernel sources are not configured for your chosen arch!"
+	fi
+
+	cd ${S}
+
+	# Add our linux source tree symlink
+	ln -snf ${KV_DIR} linux
+
+	# set the build directory
+	echo "KRNLOBJ = ${KV_OUT_DIR}" >> MCONFIG
+
+	# We do not want all the nice prelink warnings
+	# NOTE: for amd64, we might change below to '/usr/$(get_libdir)/klibc',
+	#       but I do not do it right now, as the build system do not support
+	#       the lib64 yet ....
+	cat > "${S}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/lib/klibc"
+	EOF
+
+	# Export the NOSTDINC_FLAGS to ensure -nostdlib is passed, bug #120678
+	epatch ${FILESDIR}/${P}-nostdinc-flags.patch
+
+	# klibc detects mips64 systems as having 64bit userland
+	# Force them to 32bit userlands instead
+#	if ! use n32; then
+#		epatch ${FILESDIR}/${PN}-1.1.16-mips32.patch
+#	fi
+
+	# Linker path is awry
+#	epatch ${FILESDIR}/${PN}-1.1.16-mips-ldpaths.patch
+}
+
+src_compile() {
+	if is_cross ; then
+		einfo "ARCH = \"$(guess_arch)\""
+		einfo "CROSS = \"${CTARGET}-\""
+		emake ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" || die "Compile failed!"
+	else
+		env -u ARCH \
+		emake || die "Compile failed!"
+	fi
+}
+
+src_install() {
+	local klibc_prefix
+
+	if is_cross ; then
+		make INSTALLROOT=${D} \
+			ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" \
+			install || die "Install failed!"
+
+		klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-bindir)
+	else
+		env -u ARCH \
+		make INSTALLROOT=${D} install || die "Install failed!"
+
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-bindir)
+	fi
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/${x}"
+		dosym gzip "${klibc_prefix}/${x}"
+	done
+
+	if ! is_cross ; then
+		insinto /usr/share/aclocal
+		doins ${FILESDIR}/klibc.m4
+
+		doenvd ${S}/70klibc
+
+		dodoc ${S}/README ${S}/klibc/{LICENSE,CAVEATS}
+		newdoc ${S}/klibc/README README.klibc
+		newdoc ${S}/klibc/arch/README README.klibc.arch
+		docinto dash; newdoc ${S}/dash/README.klibc README
+		docinto gzip; dodoc ${S}/gzip/{COPYING,README}
+	fi
+}
+
+pkg_postinst() {
+	# Override for linux-mod eclass
+	return 0
+}