From 9c9f970e4e79c98f192e9658e1d155c4fc6980c7 Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Fri, 9 Feb 2007 22:31:04 +0000 Subject: [PATCH] Quoting fixes, adding the -types.h patch suggested by Alon in #165472. Package-Manager: portage-2.1.2-r9 --- dev-libs/klibc/ChangeLog | 6 ++- dev-libs/klibc/Manifest | 28 +++++++------ .../klibc/files/klibc-1.4.13-types.h.patch | 12 ++++++ dev-libs/klibc/klibc-1.4.13.ebuild | 39 +++++++++++-------- 4 files changed, 56 insertions(+), 29 deletions(-) create mode 100644 dev-libs/klibc/files/klibc-1.4.13-types.h.patch diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog index da6d1d34309a..1935a0cc2d06 100644 --- a/dev-libs/klibc/ChangeLog +++ b/dev-libs/klibc/ChangeLog @@ -1,6 +1,10 @@ # 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.35 2007/01/20 10:58:43 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.36 2007/02/09 22:31:04 phreak Exp $ + + 09 Feb 2007; Christian Heim + +files/klibc-1.4.13-types.h.patch, klibc-1.4.13.ebuild: + Quoting fixes, adding the -types.h patch suggested by Alon in #165472. 20 Jan 2007; Christian Heim -files/klibc-1.1.16-mips-ldpaths.patch, -files/klibc-1.1.16-mips32.patch, diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest index 549452c44ac4..326a08e814a3 100644 --- a/dev-libs/klibc/Manifest +++ b/dev-libs/klibc/Manifest @@ -21,6 +21,10 @@ AUX klibc-1.4.13-resumelib.patch 474 RMD160 c0c04428a71e9d98d08a93d843b0ae30c123 MD5 617d52efc5e4f29c4758b511daf633a6 files/klibc-1.4.13-resumelib.patch 474 RMD160 c0c04428a71e9d98d08a93d843b0ae30c1230848 files/klibc-1.4.13-resumelib.patch 474 SHA256 3cbe36c033f7dd39875aca2e0f1881a3b993768c84f296c10078476ff4080982 files/klibc-1.4.13-resumelib.patch 474 +AUX klibc-1.4.13-types.h.patch 460 RMD160 cdd97931dc407d760f1a6c0e8b3d41111d316cb2 SHA1 d1d7c05366254bb3aa819063dbb70a84b470ca93 SHA256 38563fed0b26d7e84fff9b831b4c3a2ff0a34298f3f7270f4763cbd7a8ff68bb +MD5 6f46dec54a2dd561d680754d032a37a1 files/klibc-1.4.13-types.h.patch 460 +RMD160 cdd97931dc407d760f1a6c0e8b3d41111d316cb2 files/klibc-1.4.13-types.h.patch 460 +SHA256 38563fed0b26d7e84fff9b831b4c3a2ff0a34298f3f7270f4763cbd7a8ff68bb files/klibc-1.4.13-types.h.patch 460 AUX klibc-1.4.7-nostdinc-flags.patch 1163 RMD160 bf741c5a26ac478ff19f6b59de6eaa387c2cee1d SHA1 d08f37cccd6315f9d01c9f237204862ddd621f14 SHA256 753e782a575562c6d30d3cfd4fd0366b28b178d8bced4b57b5eaa1b020205dd5 MD5 a4c6e8236b9c25f6b558a418d88d571e files/klibc-1.4.7-nostdinc-flags.patch 1163 RMD160 bf741c5a26ac478ff19f6b59de6eaa387c2cee1d files/klibc-1.4.7-nostdinc-flags.patch 1163 @@ -53,14 +57,14 @@ EBUILD klibc-1.4.12.ebuild 6117 RMD160 f5732cb2378c8647088e3c78090918c385228820 MD5 52151bbf0bc764dfd4aa468cbe3c6103 klibc-1.4.12.ebuild 6117 RMD160 f5732cb2378c8647088e3c78090918c385228820 klibc-1.4.12.ebuild 6117 SHA256 8d88bb5a7ea5a39ec7919a2853dd1326893a04bae5cf9086b7f23659da5820e6 klibc-1.4.12.ebuild 6117 -EBUILD klibc-1.4.13.ebuild 6161 RMD160 815b7b973c2c9d954a203aac54eaed5de4704e4c SHA1 6295ba784f79dec30d4cc7e2c730d56bd6e8025e SHA256 d749437684ad62d15289ed84dcc2191d50de1ead2c81955f34c0b9f6568376c3 -MD5 b437293887bda037f25ffff523176dd0 klibc-1.4.13.ebuild 6161 -RMD160 815b7b973c2c9d954a203aac54eaed5de4704e4c klibc-1.4.13.ebuild 6161 -SHA256 d749437684ad62d15289ed84dcc2191d50de1ead2c81955f34c0b9f6568376c3 klibc-1.4.13.ebuild 6161 -MISC ChangeLog 6211 RMD160 6a69fc98dcdbb0086b0831901300f9900c6c808c SHA1 86753f94df3ae9cc6bec7eb9933ddabea0253a9a SHA256 199556bf396aa4e61b11879c442618f5226a1d435a8c7c7f72576e9d7f78b47f -MD5 309c78e3b15cd51aacb047db2837df4f ChangeLog 6211 -RMD160 6a69fc98dcdbb0086b0831901300f9900c6c808c ChangeLog 6211 -SHA256 199556bf396aa4e61b11879c442618f5226a1d435a8c7c7f72576e9d7f78b47f ChangeLog 6211 +EBUILD klibc-1.4.13.ebuild 6433 RMD160 4860300f2a76edc91d057302ee652769471e3e73 SHA1 596571726918a50a919c7bb06f4af63f0184b238 SHA256 2cd4be9392c6f5a195cb407b6e2b699429ea8b24bdfcec48c8be324a61a689a1 +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 metadata.xml 255 RMD160 75ae6908f50f0d53cbbb7701a46da40620fd2045 SHA1 b25e947b330f113c6e81ff1fcf7dd8942e2b5d6f SHA256 0423eac765a8f4f9045d4757f3ed0a4329d44e4ba43d83dc1b18a40a153b174f MD5 0e02063021e56846dae34e2f30b1936b metadata.xml 255 RMD160 75ae6908f50f0d53cbbb7701a46da40620fd2045 metadata.xml 255 @@ -81,9 +85,9 @@ MD5 37cd7042545680010abe83dd5e52d6d0 files/digest-klibc-1.4.13 241 RMD160 510d482cc1079a0026727837e952a6b15e6ea74f files/digest-klibc-1.4.13 241 SHA256 ed62a4a37224c36d34369c3903a144f73e3c78b985f3457afb876e98059cdb3a files/digest-klibc-1.4.13 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFsfW5yuNVb5qfaOYRAinLAJsHpvt8qhKVOsZSrfNEb6G3ZtBo6wCeLISg -l97b1UtZT0APFIImUtPe8yY= -=SJYh +iD8DBQFFzPYzyuNVb5qfaOYRAgTSAKCk+dAUj+RKfrp5qwHh8vYstBRPrQCgupTt +c6s3vYTiPiAG341BbFtSfvo= +=0L6p -----END PGP SIGNATURE----- diff --git a/dev-libs/klibc/files/klibc-1.4.13-types.h.patch b/dev-libs/klibc/files/klibc-1.4.13-types.h.patch new file mode 100644 index 000000000000..f08ce2fbca23 --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.4.13-types.h.patch @@ -0,0 +1,12 @@ +diff -urNp klibc-1.4.13.org/usr/include/sys/types.h klibc-1.4.13/usr/include/sys/types.h +--- klibc-1.4.13.org/usr/include/sys/types.h 2006-07-25 23:55:23.000000000 +0300 ++++ klibc-1.4.13/usr/include/sys/types.h 2007-02-07 15:24:03.000000000 +0200 +@@ -96,6 +96,8 @@ typedef uint32_t __bitwise __be32; + typedef uint64_t __bitwise __le64; + typedef uint64_t __bitwise __be64; + ++typedef __u16 __bitwise __sum16; ++ + /* + * Some headers seem to require this... + */ diff --git a/dev-libs/klibc/klibc-1.4.13.ebuild b/dev-libs/klibc/klibc-1.4.13.ebuild index 92ba6e2e23ea..969deacb72e3 100644 --- a/dev-libs/klibc/klibc-1.4.13.ebuild +++ b/dev-libs/klibc/klibc-1.4.13.ebuild @@ -1,6 +1,6 @@ # 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.4.13.ebuild,v 1.2 2007/01/20 10:58:43 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.4.13.ebuild,v 1.3 2007/02/09 22:31:04 phreak Exp $ inherit eutils linux-info multilib @@ -65,8 +65,6 @@ pkg_setup() { src_unpack() { unpack ${A} - epatch "${FILESDIR}"/${P}-resumelib.patch - if [[ ! -d /usr/${CTARGET} ]] ; then echo eerror "It does not look like your cross-compiler is setup properly!" @@ -89,13 +87,13 @@ 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 # Some reason .config has outdated mtime - touch ${S}/.config + touch "${S}"/.config # We do not want all the nice prelink warnings # NOTE: for amd64, we might change below to '/usr/$(get_libdir)/klibc', @@ -109,13 +107,22 @@ src_unpack() { # NOTE: Disabling this for now, as klibc have -fno-stack-protector. Will # enable it again if there is still issues. #epatch "${FILESDIR}/${PN}"-1.4.7-nostdinc-flags.patch + # Build interp.o with EXTRA_KLIBCAFLAGS (.S source) - epatch "${FILESDIR}/${PN}"-1.4.11-interp-flags.patch + epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.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 + + # Fix the include in ${S}usr/kinit/resume/resumelib.c to use autoconf.h + # instead of config.h. + epatch "${FILESDIR}"/${PN}-1.4.13-resumelib.patch # klibc detects mips64 systems as having 64bit userland # Force them to 32bit userlands instead if ! use n32; then - epatch "${FILESDIR}/${PN}"-1.4.9-mips32.patch + epatch "${FILESDIR}"/${PN}-1.4.9-mips32.patch fi # Linker path is awry @@ -170,7 +177,7 @@ src_install() { make \ EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ - INSTALLROOT=${D} \ + INSTALLROOT="${D}" \ ARCH=$(guess_arch) \ CROSS="${CTARGET}-" \ libdir="/usr/$(get_libdir)" \ @@ -186,7 +193,7 @@ src_install() { make \ EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ - INSTALLROOT=${D} \ + INSTALLROOT="${D}" \ libdir="/usr/$(get_libdir)" \ SHLIBDIR="/$(get_libdir)" \ mandir="/usr/share/man" \ @@ -203,15 +210,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}/usr/klibc/{LICENSE,CAVEATS} - newdoc ${S}/usr/klibc/README README.klibc - newdoc ${S}/usr/klibc/arch/README README.klibc.arch - docinto dash; newdoc ${S}/usr/dash/README.klibc README - docinto gzip; dodoc ${S}/usr/gzip/{COPYING,README} + dodoc "${S}"/README "${S}"/usr/klibc/{LICENSE,CAVEATS} + newdoc "${S}"/usr/klibc/README README.klibc + newdoc "${S}"/usr/klibc/arch/README README.klibc.arch + docinto dash; newdoc "${S}"/usr/dash/README.klibc README + docinto gzip; dodoc "${S}"/usr/gzip/{COPYING,README} fi } -- 2.26.2