Fix building with KBUILD_OUTPUT set, bug #139330. Also fix manpage

installation path, bug #122173. Also multilib related fixes.

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 249 insertions, 9 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index eefbd1836cea..b5c74887d029 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2006/07/01 10:26:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.24 2006/07/07 13:34:05 azarah Exp $
+
+*klibc-1.2.1-r2 (07 Jul 2006)
+
+  07 Jul 2006; Martin Schlemmer <azarah@gentoo.org>
+  +files/klibc-1.2.4-kbuild.patch, +klibc-1.2.1-r2.ebuild:
+  Fix building with KBUILD_OUTPUT set, bug #139330. Also fix manpage
+  installation path, bug #122173. Also multilib related fixes.
 
   01 Jul 2006; Lars Weiler <pylon@gentoo.org> klibc-1.2.1-r1.ebuild:
   Stable on ppc; bug #130175.
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index abe1a21448a0..fd378d621498 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX klibc-1.0.14-nostdlib.patch 460 RMD160 b7cf757792d33d93763f80599f7c09b81be527f3 SHA1 b45b0483c5354637e2b00e9ffa6a4d81f84e31d2 SHA256 9f33b172b3d1d71f4f23459af6e6169ce97070d1bcd81833c6e4e70fe39f1b58
 MD5 4b098438d57b0f7ad9f16d534fb98eb4 files/klibc-1.0.14-nostdlib.patch 460
 RMD160 b7cf757792d33d93763f80599f7c09b81be527f3 files/klibc-1.0.14-nostdlib.patch 460
@@ -18,15 +21,19 @@ AUX klibc-1.2.1-nostdinc-flags.patch 1107 RMD160 ed4892fef55eba29608a4173be64272
 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
+AUX klibc-1.2.4-kbuild.patch 615 RMD160 99184e5f3be6472baf15321d7c2412d906eb500d SHA1 98619e857509d6959297dcc0ea4186b0d8c0f6fe SHA256 3bffce59f04a68772c651f5e4aff1b3148961b10622cf1b53e4a12a093e25e8e
+MD5 38260078fe414c3d40db4d5ab507b9c7 files/klibc-1.2.4-kbuild.patch 615
+RMD160 99184e5f3be6472baf15321d7c2412d906eb500d files/klibc-1.2.4-kbuild.patch 615
+SHA256 3bffce59f04a68772c651f5e4aff1b3148961b10622cf1b53e4a12a093e25e8e files/klibc-1.2.4-kbuild.patch 615
 AUX klibc.m4 3619 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 SHA1 ebe92893215e7d7ec2e44af846c6ce83e7ef7f4b SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44
 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619
 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 files/klibc.m4 3619
 SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 files/klibc.m4 3619
 DIST klibc-1.0.14.tar.bz2 443250 RMD160 624f054cce200e98be95e574989a141b32b6a538 SHA256 e6221007f9c95100740340479dd1e52ab1c368904d21d3f8b53065679314d45f
-DIST klibc-1.1.1.tar.bz2 444065 RMD160 f865657052c2ee9731f48f3918b2906f01a6a795 SHA256 6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
-DIST klibc-1.1.16.tar.bz2 451284 RMD160 869ed4a53f86bf33b12e5abfa8d343b70da5f8b6 SHA256 3e7a6f303a7aca1fe938f860c9ee9c93ff7937644b9158bec07df7b1217e8d8b
-DIST klibc-1.1.tar.bz2 444770 RMD160 d25df89a8468f05e480ea7348c8cfa25aa4a061e SHA256 42de47159a382d852750e38fe4877ee2f97f2ff4c47e27f3ce512193d31f63e7
-DIST klibc-1.2.1.tar.bz2 451620 RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d SHA256 c413b565ea6bd33d4f0af5ee3319d9bc1d804e5cb859b9f3284cad2c449d7c5c
+DIST klibc-1.1.1.tar.bz2 444065 RMD160 f865657052c2ee9731f48f3918b2906f01a6a795 SHA1 595c74bccb0f4f8a9ab636d571bca8caa35ea083 SHA256 6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
+DIST klibc-1.1.16.tar.bz2 451284 RMD160 869ed4a53f86bf33b12e5abfa8d343b70da5f8b6 SHA1 8058136ba91f06ab2bf00382b079d8ed03c2585f SHA256 3e7a6f303a7aca1fe938f860c9ee9c93ff7937644b9158bec07df7b1217e8d8b
+DIST klibc-1.1.tar.bz2 444770 RMD160 d25df89a8468f05e480ea7348c8cfa25aa4a061e SHA1 167832f15b48f0d7eda160eee4b05b9afa446a69 SHA256 42de47159a382d852750e38fe4877ee2f97f2ff4c47e27f3ce512193d31f63e7
+DIST klibc-1.2.1.tar.bz2 451620 RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d SHA1 ff09e5c083326299083846cced052058a291c5bd SHA256 c413b565ea6bd33d4f0af5ee3319d9bc1d804e5cb859b9f3284cad2c449d7c5c
 EBUILD klibc-1.0.14-r1.ebuild 4123 RMD160 a2ad0c70d40090db8fac0c85db9b8525d6805294 SHA1 dc9560879c6b21034a433d0be498b365071886a1 SHA256 8d7c64fcad902a8322b231dc605bed6ebd11994f1d3da9330762b43d1e1d878d
 MD5 87eac36868c96b295f5b4b631a505db9 klibc-1.0.14-r1.ebuild 4123
 RMD160 a2ad0c70d40090db8fac0c85db9b8525d6805294 klibc-1.0.14-r1.ebuild 4123
@@ -51,14 +58,18 @@ EBUILD klibc-1.2.1-r1.ebuild 4598 RMD160 2fc5aa187a3729f9222152b7a0c3bc59a848b70
 MD5 390734c3bd8ebf1c25a8b2124f24f737 klibc-1.2.1-r1.ebuild 4598
 RMD160 2fc5aa187a3729f9222152b7a0c3bc59a848b70a klibc-1.2.1-r1.ebuild 4598
 SHA256 86b2e8fc5b2b8fddc12e95d8fa4885db76a65ebbe55d1384371d876cc965e5fa klibc-1.2.1-r1.ebuild 4598
+EBUILD klibc-1.2.1-r2.ebuild 5280 RMD160 8bf086d5e8aee7b9cd611ba59f9f292a250f4770 SHA1 b60bcbc38692938b7481327f6d6543e496a5ea48 SHA256 cae8b8f69305d56500a4dec1485312ed54630f65b58194a0d02327f87b598345
+MD5 2bc5e6b1ea4a1050bd23b4e7bb09de49 klibc-1.2.1-r2.ebuild 5280
+RMD160 8bf086d5e8aee7b9cd611ba59f9f292a250f4770 klibc-1.2.1-r2.ebuild 5280
+SHA256 cae8b8f69305d56500a4dec1485312ed54630f65b58194a0d02327f87b598345 klibc-1.2.1-r2.ebuild 5280
 EBUILD klibc-1.2.1.ebuild 4276 RMD160 30d3aec718ff2592c51c76379e0db0a25c19d78f SHA1 b63d38e5c7390a0db8ed9644dea4ba3e1597bcd9 SHA256 f19fb668f2571cfb447475c7c9a22c294eb3c494b558d684b33dc2e8bad2a9da
 MD5 631b5cb4d1ec609f7d3ed03228a596ec klibc-1.2.1.ebuild 4276
 RMD160 30d3aec718ff2592c51c76379e0db0a25c19d78f klibc-1.2.1.ebuild 4276
 SHA256 f19fb668f2571cfb447475c7c9a22c294eb3c494b558d684b33dc2e8bad2a9da klibc-1.2.1.ebuild 4276
-MISC ChangeLog 3938 RMD160 a82164fbc1a1afc4eb38eb9103edd1970a418823 SHA1 32617e9f46130a14fdffe5f439364492088d4536 SHA256 d7c89940e2fecefb936e71091bc8ae61070d50e0f8006701c769eb30fe840760
-MD5 c888caf42d665dcbb3583011445a82c2 ChangeLog 3938
-RMD160 a82164fbc1a1afc4eb38eb9103edd1970a418823 ChangeLog 3938
-SHA256 d7c89940e2fecefb936e71091bc8ae61070d50e0f8006701c769eb30fe840760 ChangeLog 3938
+MISC ChangeLog 4214 RMD160 7df1bb21411451b09c3ec04fa1ef4b5019f61001 SHA1 52ea8ed2fff1ad2a85ba1415e684bfc983a81d7e SHA256 5d36457975469ffdece58b381a18e859d850df0d3eeb0af73963fc4829a17611
+MD5 672f941889620049fee408d592e4cc8e ChangeLog 4214
+RMD160 7df1bb21411451b09c3ec04fa1ef4b5019f61001 ChangeLog 4214
+SHA256 5d36457975469ffdece58b381a18e859d850df0d3eeb0af73963fc4829a17611 ChangeLog 4214
 MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223
@@ -84,3 +95,13 @@ SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/di
 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 e2c54f1b35309be367759ba42ef5027b files/digest-klibc-1.2.1-r2 238
+RMD160 19cd909eb9419c8aa5c0e829dab15f8783188ae2 files/digest-klibc-1.2.1-r2 238
+SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/digest-klibc-1.2.1-r2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFErmMv1ZcsMnZjRyIRArj0AJ9KqAeIiQImQlOlpcoLBSf3qVMqkgCeNv/Z
+AwIoODN+PHlTEtHqxTVB7I4=
+=/fPF
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/files/digest-klibc-1.2.1-r2 b/dev-libs/klibc/files/digest-klibc-1.2.1-r2
new file mode 100644
index 000000000000..b6bfd214458f
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.2.1-r2
@@ -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.4-kbuild.patch b/dev-libs/klibc/files/klibc-1.2.4-kbuild.patch
new file mode 100644
index 000000000000..431247a989b3
--- /dev/null
+++ b/dev-libs/klibc/files/klibc-1.2.4-kbuild.patch
@@ -0,0 +1,14 @@
+diff -Naurp klibc-1.2.4-orig/scripts/Makefile.host klibc-1.2.4/scripts/Makefile.host
+--- klibc-1.2.4-orig/scripts/Makefile.host	2006-03-12 01:04:15.000000000 +0100
++++ klibc-1.2.4/scripts/Makefile.host	2006-03-12 01:17:08.000000000 +0100
+@@ -85,8 +85,8 @@ ifeq ($(KBUILD_SRC),)
+ __hostc_flags	= $(_hostc_flags)
+ __hostcxx_flags	= $(_hostcxx_flags)
+ else
+-__hostc_flags	= -I$(obj) $(call flags,_hostc_flags)
+-__hostcxx_flags	= -I$(obj) $(call flags,_hostcxx_flags)
++__hostc_flags	= -I$(obj) $(_hostc_flags)
++__hostcxx_flags	= -I$(obj) $(_hostcxx_flags)
+ endif
+ 
+ hostc_flags    = -Wp,-MD,$(depfile) $(__hostc_flags)
diff --git a/dev-libs/klibc/klibc-1.2.1-r2.ebuild b/dev-libs/klibc/klibc-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..89fab32a4dcd
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.2.1-r2.ebuild
@@ -0,0 +1,195 @@
+# 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-r2.ebuild,v 1.1 2006/07/07 13:34:05 azarah Exp $
+
+inherit eutils linux-info multilib
+
+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
+
+	# 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
+
+	# Fix building when KBUILD_OUTPUT is set, bug #122173.
+	epatch "${FILESDIR}/${PN}-1.2.4-kbuild.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() {
+	local myargs
+
+	[[ ${KV_DIR} != "${KV_OUT_DIR}" ]] && \
+		myargs="KLIBCKERNELOBJ='${KV_OUT_DIR}/' KBUILD_SRC='1'"
+
+	if is_cross ; then
+		einfo "ARCH = \"$(guess_arch)\""
+		einfo "CROSS = \"${CTARGET}-\""
+		emake ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} || die "Compile failed!"
+	else
+		env -u ARCH \
+		emake \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} || die "Compile failed!"
+	fi
+}
+
+src_install() {
+	local myargs klibc_prefix
+
+	[[ ${KV_DIR} != "${KV_OUT_DIR}" ]] && \
+		myargs="KLIBCKERNELOBJ='${KV_OUT_DIR}/' KBUILD_SRC='1'"
+
+	if is_cross ; then
+		klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-prefix)
+
+		make INSTALLROOT=${D} \
+			ARCH=$(guess_arch) \
+			CROSS="${CTARGET}-" \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} \
+			install || die "Install failed!"
+	else
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
+
+		env -u ARCH \
+		make INSTALLROOT=${D} \
+			libdir="/usr/$(get_libdir)" \
+			SHLIBDIR="/$(get_libdir)" \
+			mandir="/usr/share/man" \
+			INSTALLDIR="/usr/$(get_libdir)/klibc" \
+			${myargs} \
+			install || die "Install failed!"
+	fi
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/bin/${x}"
+		dosym gzip "${klibc_prefix}/bin/${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
+}