This revision fixes compiling of v86d (bug 198937) due to a missing patch, and splashutils due to a broken asm symlink that was installed.

Package-Manager: portage-2.1.3.19

4 files changed, 258 insertions, 5 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index 36282c272091..f3b1d4f02dab 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.51 2007/11/14 06:00:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.52 2007/11/14 15:47:40 robbat2 Exp $
+
+*klibc-1.5.7-r2 (14 Nov 2007)
+
+  14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> +klibc-1.5.7-r2.ebuild:
+  This revision fixes compiling of v86d (bug 198937) due to a missing patch,
+  and splashutils due to a broken asm symlink that was installed.
 
   14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.7-r1.ebuild:
   Bug #199048, we need to ignore KBUILD_OUTPUT.
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index 7377b758f7f9..8399968fa032 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -53,6 +53,7 @@ DIST klibc-1.4.13.tar.bz2 473178 RMD160 659f2b0f443547587f7eca46a01ce3b7a264f14c
 DIST klibc-1.5.7.tar.bz2 490790 RMD160 664448f24b6335502f40bc74a4c3f4291c6e1295 SHA1 a0f1955b1c8aac20955ee8668189f71025850fcb SHA256 d5298ba2b1f575ff058e652a6cdf753f11c2fa6efa943b1318d0874b9b03e068
 DIST klibc-1.5.tar.bz2 487483 RMD160 9329426693c39eca2c357987bfa37656570b9d35 SHA1 254444bcc3f42855ec69b3a2497d5e6162e2fe2f SHA256 27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
 DIST linux-2.6.23.tar.bz2 45488158 RMD160 755690e80751d5de86d260fe05c6eeadde116c4e SHA1 3a186adf13e44415796ab6381aa8979b16a5d5ca SHA256 d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
+DIST patch-2.6.24-rc2.bz2 9161681 RMD160 738119066eb1b91ac6e4db299dd81e469412f019 SHA1 b9a44371004907b87f17d8db52afb17a22669f96 SHA256 c316760b5489af874cfc0fdba4b0d9aacf597abeb94a871a6fbaf9876b7e4fd6
 EBUILD klibc-1.1.ebuild 4163 RMD160 3bdee15ca33572451ff609634cf178ac3019f6e2 SHA1 7a63688d69a3802da9198c6d7821d0909cbaeb0a SHA256 d28076cc05974dc7c5ef32d9e771d1ce13c9dd7d6cfec98567e3d4724b8d8915
 MD5 e1fe5abcd5347639bb35993d9c05f699 klibc-1.1.ebuild 4163
 RMD160 3bdee15ca33572451ff609634cf178ac3019f6e2 klibc-1.1.ebuild 4163
@@ -77,6 +78,10 @@ EBUILD klibc-1.5.7-r1.ebuild 5950 RMD160 1339ff79b9eac5cca112e472ef4ff93f3758d78
 MD5 68b774216b9610cc2069165c5fd208ef klibc-1.5.7-r1.ebuild 5950
 RMD160 1339ff79b9eac5cca112e472ef4ff93f3758d785 klibc-1.5.7-r1.ebuild 5950
 SHA256 606381f8475b4f468c9b5717c9fc7d328fc785bcc43d7b582fab3a080c5130b3 klibc-1.5.7-r1.ebuild 5950
+EBUILD klibc-1.5.7-r2.ebuild 6853 RMD160 7d3d43a3bcd6e7548af66a68fd21b6afc860f87a SHA1 adfece7e0bea1c2e3c3188b17aa55db29927aad5 SHA256 1ed0652e48b7c73562bede9056ae1f3fa07982b87c7c7d40d3379fedf05f3c34
+MD5 26b264c20525a977111ec5cc31f4aeda klibc-1.5.7-r2.ebuild 6853
+RMD160 7d3d43a3bcd6e7548af66a68fd21b6afc860f87a klibc-1.5.7-r2.ebuild 6853
+SHA256 1ed0652e48b7c73562bede9056ae1f3fa07982b87c7c7d40d3379fedf05f3c34 klibc-1.5.7-r2.ebuild 6853
 EBUILD klibc-1.5.7.ebuild 5707 RMD160 1f5337af7e0085e0ca023c38d985b76a1c7349b9 SHA1 fcd98940cf26eada6f9b7df3d5e91a1ac236e4a7 SHA256 4664cccdf2f37b75bddf8c9e651470a5e0e26e8dc3478f09237a40f17f4d8f20
 MD5 af73fd2e0c5587f3927d2228b648aeb7 klibc-1.5.7.ebuild 5707
 RMD160 1f5337af7e0085e0ca023c38d985b76a1c7349b9 klibc-1.5.7.ebuild 5707
@@ -85,10 +90,10 @@ EBUILD klibc-1.5.ebuild 5765 RMD160 c81daa87ba892d53e20f6aa6b18296477ebd3338 SHA
 MD5 381a1225c216a2371ed83610d2e28d00 klibc-1.5.ebuild 5765
 RMD160 c81daa87ba892d53e20f6aa6b18296477ebd3338 klibc-1.5.ebuild 5765
 SHA256 fbbf0bded7141336b6769ab9c2d9b5f7b2880ef87b592f095ddbcd9a438f32c7 klibc-1.5.ebuild 5765
-MISC ChangeLog 8792 RMD160 dc576695793553e290865d93841ab0c49775952e SHA1 73248037e2f24092d81b88998921034b48539317 SHA256 ee901487a6e2b5e3b5649e8d9c049685d70914a6350309f46dbae42e8700a1ca
-MD5 49acbefdeb6fa3987e828987eb9ef9e0 ChangeLog 8792
-RMD160 dc576695793553e290865d93841ab0c49775952e ChangeLog 8792
-SHA256 ee901487a6e2b5e3b5649e8d9c049685d70914a6350309f46dbae42e8700a1ca ChangeLog 8792
+MISC ChangeLog 9044 RMD160 7516446f386d4826d881b7e8d22a0e99d27fdef3 SHA1 0b7a576957e9455c1c2df96752625dd5d76adfc0 SHA256 1fc76e1d665e8eb52cf00f257b1e31954659f3fdd2822c137663ff7a2dece5df
+MD5 aef72ed863c79cc86cb63784ff4d9d5a ChangeLog 9044
+RMD160 7516446f386d4826d881b7e8d22a0e99d27fdef3 ChangeLog 9044
+SHA256 1fc76e1d665e8eb52cf00f257b1e31954659f3fdd2822c137663ff7a2dece5df ChangeLog 9044
 MISC metadata.xml 166 RMD160 42fd2b8820fe5c74ccd8bda2141e90fa1b3802d8 SHA1 dd2e6ea8806cfa18885ac2f0dee3e6aceee06fd0 SHA256 8a8cfc597620bb23a385c7d463e7eeab947d58038f7739a58d24fb37fdd0a83f
 MD5 ff2140a8d0a2aac189c948cdbe6fc230 metadata.xml 166
 RMD160 42fd2b8820fe5c74ccd8bda2141e90fa1b3802d8 metadata.xml 166
@@ -117,3 +122,6 @@ SHA256 b4a0e3a4ca4f12d48ea26ded0ec99bf436df33c285535c2f8ed93439247f73a1 files/di
 MD5 5300f060a65e7a482b1303a17153eed5 files/digest-klibc-1.5.7-r1 485
 RMD160 113ac4feda3efa53817b4663b008c8ec2c0a2ded files/digest-klibc-1.5.7-r1 485
 SHA256 b4a0e3a4ca4f12d48ea26ded0ec99bf436df33c285535c2f8ed93439247f73a1 files/digest-klibc-1.5.7-r1 485
+MD5 4e9c421023498ce9f5c4979ea00c0e85 files/digest-klibc-1.5.7-r2 729
+RMD160 ad8e40b27d4f0530cb1f384d801567861c8cec2a files/digest-klibc-1.5.7-r2 729
+SHA256 fa47a30819aa42e33106b0bfd018da3705530d90cc51d596df745e7b94867108 files/digest-klibc-1.5.7-r2 729
diff --git a/dev-libs/klibc/files/digest-klibc-1.5.7-r2 b/dev-libs/klibc/files/digest-klibc-1.5.7-r2
new file mode 100644
index 000000000000..2a1b1ea2b756
--- /dev/null
+++ b/dev-libs/klibc/files/digest-klibc-1.5.7-r2
@@ -0,0 +1,9 @@
+MD5 c40fb3fc772350d721555a230fc136e5 klibc-1.5.7.tar.bz2 490790
+RMD160 664448f24b6335502f40bc74a4c3f4291c6e1295 klibc-1.5.7.tar.bz2 490790
+SHA256 d5298ba2b1f575ff058e652a6cdf753f11c2fa6efa943b1318d0874b9b03e068 klibc-1.5.7.tar.bz2 490790
+MD5 2cc2fd4d521dc5d7cfce0d8a9d1b3472 linux-2.6.23.tar.bz2 45488158
+RMD160 755690e80751d5de86d260fe05c6eeadde116c4e linux-2.6.23.tar.bz2 45488158
+SHA256 d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb linux-2.6.23.tar.bz2 45488158
+MD5 384ce926e73bf27107b84cdce08c79f8 patch-2.6.24-rc2.bz2 9161681
+RMD160 738119066eb1b91ac6e4db299dd81e469412f019 patch-2.6.24-rc2.bz2 9161681
+SHA256 c316760b5489af874cfc0fdba4b0d9aacf597abeb94a871a6fbaf9876b7e4fd6 patch-2.6.24-rc2.bz2 9161681
diff --git a/dev-libs/klibc/klibc-1.5.7-r2.ebuild b/dev-libs/klibc/klibc-1.5.7-r2.ebuild
new file mode 100644
index 000000000000..5fe20b9ad17e
--- /dev/null
+++ b/dev-libs/klibc/klibc-1.5.7-r2.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.7-r2.ebuild,v 1.1 2007/11/14 15:47:40 robbat2 Exp $
+
+# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
+# This still needs major work.
+# But it is significently better than the previous version.
+# In that it will now build on biarch systems, such as ppc64-32ul.
+
+# NOTES:
+# ======
+# We need to bring in the kernel sources seperately
+# Because they have to be configured in a way that differs from the copy in
+# /usr/src/. The sys-kernel/linux-headers are too stripped down to use
+# unfortunetly.
+# This will be able to go away once the klibc author updates his code
+# to build again the headers provided by the kernel's 'headers_install' target.
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A minimal libc subset for use with initramfs."
+HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc"
+KV_MAJOR="2" KV_MINOR="6" KV_SUB="23"
+OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
+PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-rc2"
+PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2"
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2"
+SRC_URI="ftp://ftp.kernel.org/pub/linux/libs/klibc/${P}.tar.bz2
+	ftp://ftp.kernel.org/pub/linux/libs/klibc/Testing/${P}.tar.bz2
+	${PATCH_URI}
+	${KERNEL_URI}"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+KEYWORDS="~amd64 -mips ~ppc ~x86 ~sparc"
+SLOT="0"
+IUSE="debug n32"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+KS="${WORKDIR}/linux-${OKV}"
+
+# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
+QA_EXECSTACK="*"
+# Do not strip
+RESTRICT="strip"
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2 ${P}.tar.bz2
+	EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2
+	cd "${S}"
+
+	# Symlink /usr/src/linux to ${S}/linux
+	ln -snf "${KS}" linux
+	#ln -snf "/usr" linux
+
+	# Build interp.o with EXTRA_KLIBCAFLAGS (.S source)
+	epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch
+
+	# Fixes for sparc and ppc
+	epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch
+
+	# Prevent klibc from prestripping stuff
+#	epatch "${FILESDIR}"/${P}-nostrip.patch
+
+	# Fix the asm-ppc vs. asm-powerpc issue, bug #196521
+	epatch "${FILESDIR}"/${PN}-1.5-klibcasmarch.patch
+}
+
+# For a given Gentoo ARCH,
+# specify the kernel defconfig most relevant
+kernel_defconfig() {
+	a="${1:${ARCH}}"
+	# most, but not all arches have a sanely named defconfig
+	case ${a} in
+		ppc64) echo ppc64_defconfig ;;
+		ppc) echo pmac32_defconfig ;;
+		arm*|sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;;
+		*) echo defconfig ;;
+	esac
+}
+
+# klibc has it's own ideas of arches
+# They reflect userspace strictly.
+# This functions maps from a Gentoo ARCH, to an arch that klibc expects
+# Look at klibc-${S}/usr/klibc/arch for a list of these arches
+klibc_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		amd64) echo x86_64 ;;
+		mips) die 'TODO: Use the $ABI' ;;
+		x86) echo i386 ;;
+		*) echo ${a} ;;
+	esac
+}
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86|amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+src_compile() {
+	local myargs
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
+
+	cd "${KS}"
+	emake ${defconfig} || die "No defconfig"
+	emake prepare || die "Failed to prepare kernel sources for header usage"
+
+	cd "${S}"
+
+	use debug && myargs="${myargs} V=1"
+
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		${myargs} || die "Compile failed!"
+
+		#SHLIBDIR="/${libdir}" \
+
+	ARCH="${myARCH}" ABI="${myABI}"
+}
+
+src_install() {
+	local myargs
+	local myARCH="${ARCH}" myABI="${ABI}"
+	# TODO: For cross-compiling
+	# You should set ARCH and ABI here
+	CC="$(tc-getCC)"
+	HOSTCC="$(tc-getBUILD_CC)"
+	KLIBCARCH="$(klibc_arch ${ARCH})"
+	KLIBCASMARCH="$(kernel_asm_arch ${ARCH})"
+	libdir="$(get_libdir)"
+	# This should be the defconfig corresponding to your userspace!
+	# NOT your kernel. PPC64-32ul would choose 'ppc' for example.
+	defconfig=$(kernel_defconfig ${ARCH})
+
+	use debug && myargs="${myargs} V=1"
+
+	local klibc_prefix
+	if tc-is-cross-compiler ; then
+		klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix)
+	else
+		klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix)
+	fi
+
+	unset ABI ARCH # Unset these, because they interfere
+	unset KBUILD_OUTPUT # we are using a private copy
+
+	emake \
+		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
+		EXTRA_KLIBCLDFLAGS="-z,noexecstack" \
+		HOSTCC="${HOSTCC}" CC="${CC}" \
+		INSTALLDIR="/usr/${libdir}/klibc" \
+		INSTALLROOT="${D}" \
+		KLIBCARCH=${KLIBCARCH} \
+		KLIBCASMARCH=${KLIBCASMARCH} \
+		SHLIBDIR="/${libdir}" \
+		libdir="/usr/${libdir}" \
+		mandir="/usr/share/man" \
+		${myargs} \
+		install || die "Install failed!"
+
+		#SHLIBDIR="/${libdir}" \
+
+	# klibc doesn't support prelinking, so we need to mask it
+	cat > "${T}/70klibc" <<-EOF
+		PRELINK_PATH_MASK="/usr/${libdir}/klibc"
+	EOF
+
+	doenvd "${T}"/70klibc
+
+	# Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include
+	# Actually I have no idea, why the includes have those weird-ass permissions
+	# on a particular system, might be due to inherited permissions from parent
+	# directory
+	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
+
+	# Hardlinks becoming copies
+	for x in gunzip zcat ; do
+		rm -f "${D}/${klibc_prefix}/bin/${x}"
+		dosym gzip "${klibc_prefix}/bin/${x}"
+	done
+
+	# Restore now, so we can use the tc- functions
+	ARCH="${myARCH}" ABI="${myABI}"
+	if ! tc-is-cross-compiler ; then
+		cd "${S}"
+		insinto /usr/share/aclocal
+		doins contrib/klibc.m4
+
+		dodoc README usr/klibc/CAVEATS usr/klibc/README
+		newdoc usr/klibc/arch/README README.klibc.arch
+		docinto dash; newdoc usr/dash/README.klibc README
+		docinto gzip; dodoc usr/gzip/README
+	fi
+
+	# Fix up the symlink
+	# Mainly for merged arches
+	linkname="${D}/usr/${libdir}/klibc/include/asm"
+	if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then 
+		ln -snf asm-${KLIBCASMARCH} "${linkname}"
+	fi
+}