diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2007-11-12 10:17:28 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-11-12 10:17:28 +0000 |
commit | de504b24a085c8b50f924a55e07992f908e1be37 (patch) | |
tree | a6b1a18456f40b2048ed568ff8f7b02fd8846d72 /dev-libs/klibc | |
parent | Remove mail-filter/dspam:logrotate (#198901). (diff) | |
download | historical-de504b24a085c8b50f924a55e07992f908e1be37.tar.gz historical-de504b24a085c8b50f924a55e07992f908e1be37.tar.bz2 historical-de504b24a085c8b50f924a55e07992f908e1be37.zip |
Bug #190113, add biarch support for ppc64-32ul et al. Redo of a lot of the handling.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-libs/klibc')
-rw-r--r-- | dev-libs/klibc/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/klibc/Manifest | 35 | ||||
-rw-r--r-- | dev-libs/klibc/files/digest-klibc-1.5.7 | 6 | ||||
-rw-r--r-- | dev-libs/klibc/files/klibc-1.5-nostrip.patch | 1 | ||||
-rw-r--r-- | dev-libs/klibc/files/klibc-1.5-sigaction.patch | 37 | ||||
-rw-r--r-- | dev-libs/klibc/klibc-1.5.7.ebuild | 196 |
6 files changed, 270 insertions, 15 deletions
diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog index 9457ecb46d80..48741284e77b 100644 --- a/dev-libs/klibc/ChangeLog +++ b/dev-libs/klibc/ChangeLog @@ -1,6 +1,14 @@ # 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.48 2007/11/04 10:09:19 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.49 2007/11/12 10:17:27 robbat2 Exp $ + +*klibc-1.5.7 (12 Nov 2007) + + 12 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> + +files/klibc-1.5-nostrip.patch, +files/klibc-1.5-sigaction.patch, + +klibc-1.5.7.ebuild: + Bug #190113, add biarch support for ppc64-32ul et al. Redo of a lot of the + handling. 04 Nov 2007; Christian Heim <phreak@gentoo.org> metadata.xml: Removing myself as the maintainer. diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest index 899b5a6d8ef0..ad8bb5c490cc 100644 --- a/dev-libs/klibc/Manifest +++ b/dev-libs/klibc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX klibc-1.1-mips32.patch 670 RMD160 ecab014d68b65837eb6088c21d95be0c23170cfc SHA1 68b24422a59e4479c636dfd4fcd56be06dc01db3 SHA256 42d127d2d5348b7856d33b7ffce986d49c7adbef82cf2bb34aa06a022fabad4c MD5 d771e07746a2d5b2bdac366cd992c885 files/klibc-1.1-mips32.patch 670 RMD160 ecab014d68b65837eb6088c21d95be0c23170cfc files/klibc-1.1-mips32.patch 670 @@ -33,6 +30,14 @@ AUX klibc-1.4.9-mips32.patch 632 RMD160 7f9769770208f6b5e44df88f22a682b29acbad3b MD5 b74d27999ddd26a5b44477849bda10d1 files/klibc-1.4.9-mips32.patch 632 RMD160 7f9769770208f6b5e44df88f22a682b29acbad3b files/klibc-1.4.9-mips32.patch 632 SHA256 546ca8b913721671767fc0c119d694ddaead20f259738ea822a295e20e4f22d3 files/klibc-1.4.9-mips32.patch 632 +AUX klibc-1.5-nostrip.patch 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 SHA1 adc83b19e793491b1c6ea0fd8b46cd9f32e592fc SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b +MD5 68b329da9893e34099c7d8ad5cb9c940 files/klibc-1.5-nostrip.patch 1 +RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/klibc-1.5-nostrip.patch 1 +SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/klibc-1.5-nostrip.patch 1 +AUX klibc-1.5-sigaction.patch 928 RMD160 00d04da5dfdf667d2ff46491212d98047adac925 SHA1 c996533744af2256c75fb7ab715a3942bf3c2768 SHA256 bd50f00b36fb4425c6921224bde5862c05fa6271c984bfadd94284cf3f5973e5 +MD5 415347d1c3413ce8079bac62bdaceef7 files/klibc-1.5-sigaction.patch 928 +RMD160 00d04da5dfdf667d2ff46491212d98047adac925 files/klibc-1.5-sigaction.patch 928 +SHA256 bd50f00b36fb4425c6921224bde5862c05fa6271c984bfadd94284cf3f5973e5 files/klibc-1.5-sigaction.patch 928 AUX klibc.m4 3619 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 SHA1 ebe92893215e7d7ec2e44af846c6ce83e7ef7f4b SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 MD5 790a9f0a9a74e6eac6c6c1dbde2a94b6 files/klibc.m4 3619 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 files/klibc.m4 3619 @@ -41,7 +46,9 @@ DIST klibc-1.1.tar.bz2 444770 RMD160 d25df89a8468f05e480ea7348c8cfa25aa4a061e SH DIST klibc-1.2.1.tar.bz2 451620 RMD160 d0ea3418622c008884c0efb6dee693aa03eca90d SHA1 ff09e5c083326299083846cced052058a291c5bd SHA256 c413b565ea6bd33d4f0af5ee3319d9bc1d804e5cb859b9f3284cad2c449d7c5c DIST klibc-1.4.12.tar.bz2 473002 RMD160 f10be3132faf99b2e75287c05aa5d1d12c58ebcf SHA1 e61fc2bc3ebebcb60e1e24096f8496d46d977049 SHA256 78f7330e156080809c82dce6d3461ed1f8a547db58bc99c162253c71f3865e89 DIST klibc-1.4.13.tar.bz2 473178 RMD160 659f2b0f443547587f7eca46a01ce3b7a264f14c SHA1 36bf42f6225c522c4a930d217550ccf1b9178f60 SHA256 54d45fa13cf50cc0dfd7f960046e152e74cb80f150f816d4587cc7a140ea1d72 +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 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 @@ -62,14 +69,18 @@ EBUILD klibc-1.4.13.ebuild 6734 RMD160 45f074e86ac677fd1a2e65af3c59730352931618 MD5 b85fd296bc7db59ca79e0232c6f7529b klibc-1.4.13.ebuild 6734 RMD160 45f074e86ac677fd1a2e65af3c59730352931618 klibc-1.4.13.ebuild 6734 SHA256 b04c5b1cd886dd126bbdfa30232a42b14cb18d7c568e7d84565f481f5edebb95 klibc-1.4.13.ebuild 6734 +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 +SHA256 4664cccdf2f37b75bddf8c9e651470a5e0e26e8dc3478f09237a40f17f4d8f20 klibc-1.5.7.ebuild 5707 EBUILD klibc-1.5.ebuild 5765 RMD160 c81daa87ba892d53e20f6aa6b18296477ebd3338 SHA1 24ac5bd1edc8e8853354c82de3b523bd7de5f133 SHA256 fbbf0bded7141336b6769ab9c2d9b5f7b2880ef87b592f095ddbcd9a438f32c7 MD5 381a1225c216a2371ed83610d2e28d00 klibc-1.5.ebuild 5765 RMD160 c81daa87ba892d53e20f6aa6b18296477ebd3338 klibc-1.5.ebuild 5765 SHA256 fbbf0bded7141336b6769ab9c2d9b5f7b2880ef87b592f095ddbcd9a438f32c7 klibc-1.5.ebuild 5765 -MISC ChangeLog 8139 RMD160 71b99eb494044e9196c757f5a3306a22df49e875 SHA1 3064aaf3120d33bab6a7044afbdb88379def2088 SHA256 c4f3746fb6e90de676e16e3cf14621118c01660ba51289585c3e60f2920a119d -MD5 b3eef65f9a021d165ba27198e1f1eff7 ChangeLog 8139 -RMD160 71b99eb494044e9196c757f5a3306a22df49e875 ChangeLog 8139 -SHA256 c4f3746fb6e90de676e16e3cf14621118c01660ba51289585c3e60f2920a119d ChangeLog 8139 +MISC ChangeLog 8402 RMD160 e5298639cd48d522106ccab93776d4301cfc7751 SHA1 5432e35ecd317cb181476d2f83dffc8b41355bc2 SHA256 f85e1506089592eb81033dd6ac99a641dd89899b5c30247eff9cee917c04eb96 +MD5 e7e38990d2ce78140c6744fbfb5cef3d ChangeLog 8402 +RMD160 e5298639cd48d522106ccab93776d4301cfc7751 ChangeLog 8402 +SHA256 f85e1506089592eb81033dd6ac99a641dd89899b5c30247eff9cee917c04eb96 ChangeLog 8402 MISC metadata.xml 166 RMD160 42fd2b8820fe5c74ccd8bda2141e90fa1b3802d8 SHA1 dd2e6ea8806cfa18885ac2f0dee3e6aceee06fd0 SHA256 8a8cfc597620bb23a385c7d463e7eeab947d58038f7739a58d24fb37fdd0a83f MD5 ff2140a8d0a2aac189c948cdbe6fc230 metadata.xml 166 RMD160 42fd2b8820fe5c74ccd8bda2141e90fa1b3802d8 metadata.xml 166 @@ -92,10 +103,6 @@ SHA256 ed62a4a37224c36d34369c3903a144f73e3c78b985f3457afb876e98059cdb3a files/di MD5 b79c6ebc2ec3079964fc074dfe80e380 files/digest-klibc-1.5 232 RMD160 759a89e619b883990d30497b55d5042ca172a108 files/digest-klibc-1.5 232 SHA256 9b784615ed975d744c25afbf8716126d2e2446a20b4a9146d0ced31cda10e26e files/digest-klibc-1.5 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) - -iD8DBQFHLZq5yuNVb5qfaOYRAuAUAJ93/fXw7BOIPgTeWtiMfoVUYXInsQCglEpn -F/LRNQG776Ierxj4jGzRG+g= -=0uwX ------END PGP SIGNATURE----- +MD5 5300f060a65e7a482b1303a17153eed5 files/digest-klibc-1.5.7 485 +RMD160 113ac4feda3efa53817b4663b008c8ec2c0a2ded files/digest-klibc-1.5.7 485 +SHA256 b4a0e3a4ca4f12d48ea26ded0ec99bf436df33c285535c2f8ed93439247f73a1 files/digest-klibc-1.5.7 485 diff --git a/dev-libs/klibc/files/digest-klibc-1.5.7 b/dev-libs/klibc/files/digest-klibc-1.5.7 new file mode 100644 index 000000000000..eb6432b52976 --- /dev/null +++ b/dev-libs/klibc/files/digest-klibc-1.5.7 @@ -0,0 +1,6 @@ +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 diff --git a/dev-libs/klibc/files/klibc-1.5-nostrip.patch b/dev-libs/klibc/files/klibc-1.5-nostrip.patch new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.5-nostrip.patch @@ -0,0 +1 @@ + diff --git a/dev-libs/klibc/files/klibc-1.5-sigaction.patch b/dev-libs/klibc/files/klibc-1.5-sigaction.patch new file mode 100644 index 000000000000..59f422048de1 --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.5-sigaction.patch @@ -0,0 +1,37 @@ +--- + usr/include/arch/ppc/klibc/archsignal.h | 6 ++++++ + usr/include/arch/sparc/klibc/archsignal.h | 7 ------- + 2 files changed, 6 insertions(+), 7 deletions(-) + +--- a/usr/include/arch/ppc/klibc/archsignal.h ++++ b/usr/include/arch/ppc/klibc/archsignal.h +@@ -8,7 +8,13 @@ + #ifndef _KLIBC_ARCHSIGNAL_H + #define _KLIBC_ARCHSIGNAL_H + ++#ifdef _SIGNAL_H ++#undef _SIGNAL_H + #include <asm/signal.h> ++#define _SIGNAL_H ++#else ++#include <asm/signal.h> ++#endif + /* No special stuff for this architecture */ + + #endif +--- a/usr/include/arch/sparc/klibc/archsignal.h ++++ b/usr/include/arch/sparc/klibc/archsignal.h +@@ -11,13 +11,6 @@ + #define __WANT_POSIX1B_SIGNALS__ + #include <asm/signal.h> + +-struct sigaction { +- __sighandler_t sa_handler; +- unsigned long sa_flags; +- void (*sa_restorer)(void); /* Not used by Linux/SPARC */ +- sigset_t sa_mask; +-}; +- + /* Not actually used by the kernel... */ + #define SA_RESTORER 0x80000000 + diff --git a/dev-libs/klibc/klibc-1.5.7.ebuild b/dev-libs/klibc/klibc-1.5.7.ebuild new file mode 100644 index 000000000000..97cd48bb61bc --- /dev/null +++ b/dev-libs/klibc/klibc-1.5.7.ebuild @@ -0,0 +1,196 @@ +# 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.ebuild,v 1.1 2007/11/12 10:17:27 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" +OKV="2.6.23" KV_MAJOR="2" KV_MINOR="6" +KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/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 + ${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="*" + +src_unpack() { + unpack ${A} + 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 +} + +# 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 +} + +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})" + 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 + + 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} \ + 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})" + 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 + + emake \ + EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ + EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ + HOSTCC="${HOSTCC}" CC="${CC}" \ + INSTALLDIR="/usr/${libdir}/klibc" \ + INSTALLROOT="${D}" \ + KLIBCARCH=${KLIBCARCH} \ + 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 + +} |