From 524c95ff2c372e287c7dc9e476b6e334d8be2391 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Sat, 10 Feb 2007 14:23:50 +0000 Subject: [PATCH] Backporting the types.h fix from 1.4.33 to 1.2.1-r2, making current stable work for kernel >=2.6.19. Quoting fixes. Backporting the QA_EXECSTACK stuff from 1.4.33. Package-Manager: portage-2.1.2-r9 --- dev-libs/klibc/ChangeLog | 7 ++++- dev-libs/klibc/Manifest | 22 ++++++++-------- dev-libs/klibc/klibc-1.2.1-r2.ebuild | 39 ++++++++++++++++------------ 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog index 1935a0cc2d06..b44e96813960 100644 --- a/dev-libs/klibc/ChangeLog +++ b/dev-libs/klibc/ChangeLog @@ -1,6 +1,11 @@ # 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.36 2007/02/09 22:31:04 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.37 2007/02/10 14:23:50 phreak Exp $ + + 10 Feb 2007; Christian Heim klibc-1.2.1-r2.ebuild: + Backporting the types.h fix from 1.4.33 to 1.2.1-r2, making current stable + work for kernel >=2.6.19. Quoting fixes. Backporting the QA_EXECSTACK stuff + from 1.4.33. 09 Feb 2007; Christian Heim +files/klibc-1.4.13-types.h.patch, klibc-1.4.13.ebuild: diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest index 326a08e814a3..d4ed5ef6bfcd 100644 --- a/dev-libs/klibc/Manifest +++ b/dev-libs/klibc/Manifest @@ -49,10 +49,10 @@ 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 5320 RMD160 563e831320e61d37e9f75230e9ac5659df3736bb SHA1 297e18f27cd3b0eb29129432a8cfd8d39ec1429a SHA256 2f64ea0557792cefdbf579932c52a99c6c55f12aff92b1c4529683c118f3f305 -MD5 84be96300be6f0d687b47953d0018038 klibc-1.2.1-r2.ebuild 5320 -RMD160 563e831320e61d37e9f75230e9ac5659df3736bb klibc-1.2.1-r2.ebuild 5320 -SHA256 2f64ea0557792cefdbf579932c52a99c6c55f12aff92b1c4529683c118f3f305 klibc-1.2.1-r2.ebuild 5320 +EBUILD klibc-1.2.1-r2.ebuild 5580 RMD160 2945c344ee2cf8a82dd727b24a84aa0c7a54404c SHA1 9453b9889e56107a9344dd03a92818aa7b724836 SHA256 c24d973c1962501868d735b53c96174f91de12406827ff2e75dfdeff3a93f508 +MD5 5b0cf6c454f6e4efb984d4507338afb0 klibc-1.2.1-r2.ebuild 5580 +RMD160 2945c344ee2cf8a82dd727b24a84aa0c7a54404c klibc-1.2.1-r2.ebuild 5580 +SHA256 c24d973c1962501868d735b53c96174f91de12406827ff2e75dfdeff3a93f508 klibc-1.2.1-r2.ebuild 5580 EBUILD klibc-1.4.12.ebuild 6117 RMD160 f5732cb2378c8647088e3c78090918c385228820 SHA1 365fe5ea460f5a5fa5388bcc0c9e2dd674a603ce SHA256 8d88bb5a7ea5a39ec7919a2853dd1326893a04bae5cf9086b7f23659da5820e6 MD5 52151bbf0bc764dfd4aa468cbe3c6103 klibc-1.4.12.ebuild 6117 RMD160 f5732cb2378c8647088e3c78090918c385228820 klibc-1.4.12.ebuild 6117 @@ -61,10 +61,10 @@ EBUILD klibc-1.4.13.ebuild 6433 RMD160 4860300f2a76edc91d057302ee652769471e3e73 MD5 ad5d1c08f58e040e612a468c103832d2 klibc-1.4.13.ebuild 6433 RMD160 4860300f2a76edc91d057302ee652769471e3e73 klibc-1.4.13.ebuild 6433 SHA256 2cd4be9392c6f5a195cb407b6e2b699429ea8b24bdfcec48c8be324a61a689a1 klibc-1.4.13.ebuild 6433 -MISC ChangeLog 6393 RMD160 aa1f8731f9d9c07e9e3479365fded440b610ff4c SHA1 17f592be8b16100edd6665aaeed7ecb8b003bc0a SHA256 72d79709d3f9b8caee6551a684dfe5600394a9621d59128455834692b33bc72e -MD5 437adb8a04da9ca75cc7493625e338b8 ChangeLog 6393 -RMD160 aa1f8731f9d9c07e9e3479365fded440b610ff4c ChangeLog 6393 -SHA256 72d79709d3f9b8caee6551a684dfe5600394a9621d59128455834692b33bc72e ChangeLog 6393 +MISC ChangeLog 6637 RMD160 4ffe264a947a80373921150271eda9a589b0aaa5 SHA1 7bda55222d1f906ba102bc082406e15840035a23 SHA256 206e5229b7a11f8f881670d88ba440036a57c808e482e4c67390bd6b7cf81beb +MD5 f1a38c92749527d4f509a0664b38b245 ChangeLog 6637 +RMD160 4ffe264a947a80373921150271eda9a589b0aaa5 ChangeLog 6637 +SHA256 206e5229b7a11f8f881670d88ba440036a57c808e482e4c67390bd6b7cf81beb ChangeLog 6637 MISC metadata.xml 255 RMD160 75ae6908f50f0d53cbbb7701a46da40620fd2045 SHA1 b25e947b330f113c6e81ff1fcf7dd8942e2b5d6f SHA256 0423eac765a8f4f9045d4757f3ed0a4329d44e4ba43d83dc1b18a40a153b174f MD5 0e02063021e56846dae34e2f30b1936b metadata.xml 255 RMD160 75ae6908f50f0d53cbbb7701a46da40620fd2045 metadata.xml 255 @@ -87,7 +87,7 @@ SHA256 ed62a4a37224c36d34369c3903a144f73e3c78b985f3457afb876e98059cdb3a files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFzPYzyuNVb5qfaOYRAgTSAKCk+dAUj+RKfrp5qwHh8vYstBRPrQCgupTt -c6s3vYTiPiAG341BbFtSfvo= -=0L6p +iD8DBQFFzdV/yuNVb5qfaOYRAjSPAKCPmUxl4sGxtIdEhCQtKMLO3wet3ACeL8HV +Tkic1C+sC0++yWqjUD+nSYk= +=SocN -----END PGP SIGNATURE----- diff --git a/dev-libs/klibc/klibc-1.2.1-r2.ebuild b/dev-libs/klibc/klibc-1.2.1-r2.ebuild index 89dcc3d8127c..ba46ecf28c29 100644 --- a/dev-libs/klibc/klibc-1.2.1-r2.ebuild +++ b/dev-libs/klibc/klibc-1.2.1-r2.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.2.1-r2.ebuild,v 1.5 2006/09/03 09:01:01 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.2.1-r2.ebuild,v 1.6 2007/02/10 14:23:50 phreak Exp $ inherit eutils linux-info multilib +# klibc has no PT_GNU_STACK support, so scanning for execstacks is moot +QA_EXECSTACK="*" + export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then @@ -83,7 +86,7 @@ src_unpack() { die "Your kernel sources are not configured for your chosen arch!" fi - cd ${S} + cd "${S}" # Add our linux source tree symlink ln -snf ${KV_DIR} linux @@ -97,19 +100,23 @@ src_unpack() { EOF # Export the NOSTDINC_FLAGS to ensure -nostdlib is passed, bug #120678 - epatch ${FILESDIR}/${P}-nostdinc-flags.patch + epatch "${FILESDIR}"/${P}-nostdinc-flags.patch # Fix building when KBUILD_OUTPUT is set, bug #122173. - epatch "${FILESDIR}/${PN}-1.2.4-kbuild.patch" + epatch "${FILESDIR}"/${PN}-1.2.4-kbuild.patch + + # Fix a nasty typedef error in the sources, appearing on >= linux-2.6.19 + # (see #165472). + epatch "${FILESDIR}"/${PN}-1.4.13-types.h.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 +# epatch "${FILESDIR}"/${PN}-1.1.16-mips32.patch # fi # Linker path is awry -# epatch ${FILESDIR}/${PN}-1.1.16-mips-ldpaths.patch +# epatch "${FILESDIR}"/${PN}-1.1.16-mips-ldpaths.patch } src_compile() { @@ -148,7 +155,7 @@ src_install() { if is_cross ; then klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-prefix) - make INSTALLROOT=${D} \ + make INSTALLROOT="${D}" \ ARCH=$(guess_arch) \ CROSS="${CTARGET}-" \ libdir="/usr/$(get_libdir)" \ @@ -161,7 +168,7 @@ src_install() { klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix) env -u ARCH \ - make INSTALLROOT=${D} \ + make INSTALLROOT="${D}" \ libdir="/usr/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ mandir="/usr/share/man" \ @@ -178,15 +185,15 @@ src_install() { if ! is_cross ; then insinto /usr/share/aclocal - doins ${FILESDIR}/klibc.m4 + doins "${FILESDIR}"/klibc.m4 - doenvd ${S}/70klibc + 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} + 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 } -- 2.26.2