diff options
Diffstat (limited to 'dev-libs/klibc')
| -rw-r--r-- | dev-libs/klibc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/klibc/Manifest | 28 | ||||
| -rw-r--r-- | dev-libs/klibc/files/digest-klibc-1.4.11 | 3 | ||||
| -rw-r--r-- | dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch | 13 | ||||
| -rw-r--r-- | dev-libs/klibc/klibc-1.4.11.ebuild | 219 |
5 files changed, 262 insertions, 9 deletions
diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog index 7dd11dd854c3..51452bd47260 100644 --- a/dev-libs/klibc/ChangeLog +++ b/dev-libs/klibc/ChangeLog @@ -1,6 +1,12 @@ # 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.30 2006/07/18 13:55:49 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.31 2006/07/19 13:13:06 azarah Exp $ + +*klibc-1.4.11 (19 Jul 2006) + + 19 Jul 2006; Martin Schlemmer <azarah@gentoo.org> + +files/klibc-1.4.11-interp-flags.patch, +klibc-1.4.11.ebuild: + New testing release. 18 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> klibc-1.2.1-r2.ebuild: Stable on amd64 wrt bug #139330. diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest index a316caa87322..5c919140e858 100644 --- a/dev-libs/klibc/Manifest +++ b/dev-libs/klibc/Manifest @@ -21,6 +21,10 @@ AUX klibc-1.2.4-kbuild.patch 615 RMD160 99184e5f3be6472baf15321d7c2412d906eb500d 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-1.4.11-interp-flags.patch 494 RMD160 71081dc5eae8fff2adc43873f6b447f9b37a2432 SHA1 ecdea82ccbd77c63f8a65443fd64b65325869627 SHA256 ef8c05d059bc0185b8b68ea42e660fa13ddb55e9653b10fbfdabd77dea7abe2a +MD5 82dedd1a4103f65349252a1b755d40ed files/klibc-1.4.11-interp-flags.patch 494 +RMD160 71081dc5eae8fff2adc43873f6b447f9b37a2432 files/klibc-1.4.11-interp-flags.patch 494 +SHA256 ef8c05d059bc0185b8b68ea42e660fa13ddb55e9653b10fbfdabd77dea7abe2a files/klibc-1.4.11-interp-flags.patch 494 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 @@ -40,6 +44,7 @@ SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 files/kl 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 +DIST klibc-1.4.11.tar.bz2 472992 RMD160 d29ef33503f9029b413bf5be30171db17981272a SHA1 51956ac43c057fa6ce3a4eab60603874eaf61ea2 SHA256 659fa977ae4bf83ea2c507304e9df839b81d0fb3526d57049886486038009203 DIST klibc-1.4.9.tar.bz2 472957 RMD160 48ac1b171f2f2b5b7b40b791c70adb446502c95c SHA1 39ef201ada1a5a9ab86081367e5549caf512eb1c SHA256 dfde10068f74b7b8d675907bffcb783b5871d35ddc323ee08a7be241bf2ac74f EBUILD klibc-1.1.16-r1.ebuild 4240 RMD160 6661dd8da518731a420ff98d7dc3f4aabbbeac40 SHA1 fb616105b742112f4f0b9c9db70fec85e0514508 SHA256 7aecfa6e8f3a63fe3c855113c4e535ba93fdc212e9af5818ac1daa35d715858a MD5 92a3930943687a2c731a7a6eab4850cd klibc-1.1.16-r1.ebuild 4240 @@ -57,14 +62,18 @@ EBUILD klibc-1.2.1-r2.ebuild 5323 RMD160 8319d2f1debd114c0ea0f87126d687ecbf569ef MD5 645477c67c60ba76c945a13fc08f2804 klibc-1.2.1-r2.ebuild 5323 RMD160 8319d2f1debd114c0ea0f87126d687ecbf569efa klibc-1.2.1-r2.ebuild 5323 SHA256 261ee66329adbf2cc03eba46178c79e57a27c954b99a4821d835c67d1f74ca3d klibc-1.2.1-r2.ebuild 5323 +EBUILD klibc-1.4.11.ebuild 6117 RMD160 c547fd70479a98be82093b641804eba9f67475ea SHA1 bf0e29f1afd101ee92b373311a6b455a315f299d SHA256 1a833a58e63d462f62f2db504673fc672360510c23c578d0ee2b7aae078fa65b +MD5 ba9098811d28d00287801fa909fdc3e3 klibc-1.4.11.ebuild 6117 +RMD160 c547fd70479a98be82093b641804eba9f67475ea klibc-1.4.11.ebuild 6117 +SHA256 1a833a58e63d462f62f2db504673fc672360510c23c578d0ee2b7aae078fa65b klibc-1.4.11.ebuild 6117 EBUILD klibc-1.4.9.ebuild 6292 RMD160 39317d7e91c615c35cdaa8c42c6bf6dcc9022575 SHA1 fe920c969bb9c4be1184a89670a8eb99df39d1e9 SHA256 2de65cc60e490ce1bbd0d51c84b8d603b45382045a78802f64359646bce9f787 MD5 df21a147609a439e2ab8039bfc3748c9 klibc-1.4.9.ebuild 6292 RMD160 39317d7e91c615c35cdaa8c42c6bf6dcc9022575 klibc-1.4.9.ebuild 6292 SHA256 2de65cc60e490ce1bbd0d51c84b8d603b45382045a78802f64359646bce9f787 klibc-1.4.9.ebuild 6292 -MISC ChangeLog 5215 RMD160 9b239ab40a6444d0001008d3c665306202cadb0f SHA1 e584367fdee77a9aec8113373983ab471f766297 SHA256 1018f8984131d74c3dd0cfb28a49b6757f6de5c4fd7d19a4931b8c9c35321319 -MD5 be18022d5f0e6003b0288fef73457911 ChangeLog 5215 -RMD160 9b239ab40a6444d0001008d3c665306202cadb0f ChangeLog 5215 -SHA256 1018f8984131d74c3dd0cfb28a49b6757f6de5c4fd7d19a4931b8c9c35321319 ChangeLog 5215 +MISC ChangeLog 5382 RMD160 313392226b8701d70fc5d4806884d24f0b7947d0 SHA1 55bf7ed67ca857ed158721daa49f0926dfc456cc SHA256 504479143cb177de6c7f7df793d25f30597ebe5b434a53d02c63dd8d1257a349 +MD5 6f3a5696686c40fe2834d87e9929eb0c ChangeLog 5382 +RMD160 313392226b8701d70fc5d4806884d24f0b7947d0 ChangeLog 5382 +SHA256 504479143cb177de6c7f7df793d25f30597ebe5b434a53d02c63dd8d1257a349 ChangeLog 5382 MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223 @@ -81,13 +90,16 @@ SHA256 382c935239962cf639e051b35213a499e7a8762baee40721d5d33fe5d0edfe32 files/di 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 +MD5 7dd87e86801e17680ac6d6d17d04299d files/digest-klibc-1.4.11 241 +RMD160 d01b3d4b92900bf0cb60537417690c3dd2e7259d files/digest-klibc-1.4.11 241 +SHA256 0e98cabdf187bed3878d0dbf7a1ea45883631d3cd0a81bfa0a46e8af62015c38 files/digest-klibc-1.4.11 241 MD5 dccb10398029772dff790f1d2c86d4fb files/digest-klibc-1.4.9 238 RMD160 d87ef57748a55855ba6d968f55243fedfb174ceb files/digest-klibc-1.4.9 238 SHA256 17a5887d09ccda088ccbc8d35140be5bf3f099aeb7f05fad5f6d1c144320243f files/digest-klibc-1.4.9 238 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEvOhukT4lNIS36YERAj2xAJ9wTtaCTxPV/HryouqZ/hhd21GKiACgsD7U -Y294zicvne4MqaokIZnweJw= -=r0gR +iD8DBQFEvjBz1ZcsMnZjRyIRAlWSAJ4kMoBaH/ntzmWYhYYgz40OLIKNRACfaxoW +4yTPAQ25zAaf/jR+SIwMLx4= +=W6Gb -----END PGP SIGNATURE----- diff --git a/dev-libs/klibc/files/digest-klibc-1.4.11 b/dev-libs/klibc/files/digest-klibc-1.4.11 new file mode 100644 index 000000000000..bab01e163222 --- /dev/null +++ b/dev-libs/klibc/files/digest-klibc-1.4.11 @@ -0,0 +1,3 @@ +MD5 e2b146c75d0c506d8bfc4f3d21c7f983 klibc-1.4.11.tar.bz2 472992 +RMD160 d29ef33503f9029b413bf5be30171db17981272a klibc-1.4.11.tar.bz2 472992 +SHA256 659fa977ae4bf83ea2c507304e9df839b81d0fb3526d57049886486038009203 klibc-1.4.11.tar.bz2 472992 diff --git a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch new file mode 100644 index 000000000000..a5bb91765287 --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch @@ -0,0 +1,13 @@ +diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild +index c2bfd2f..8066bda 100644 +--- a/usr/klibc/Kbuild ++++ b/usr/klibc/Kbuild +@@ -152,7 +152,7 @@ # build interp.o + targets += interp.o + + quiet_cmd_interp = BUILD $@ +- cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ ++ cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__ \ + -DLIBDIR=\"$(SHLIBDIR)\" \ + -DSOHASH=\"$(SOLIBHASH)\" \ + -c -o $@ $< diff --git a/dev-libs/klibc/klibc-1.4.11.ebuild b/dev-libs/klibc/klibc-1.4.11.ebuild new file mode 100644 index 000000000000..1f7130d26dda --- /dev/null +++ b/dev-libs/klibc/klibc-1.4.11.ebuild @@ -0,0 +1,219 @@ +# 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.4.11.ebuild,v 1.1 2006/07/19 13:13:06 azarah 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 + 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="debug 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}/usr/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 + + einfo "CTARGET = $CTARGET" + 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-::' | \ + sed -e 's/powerpc/ppc/') + 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 + + # Some reason .config has outdated mtime + touch ${S}/.config + + # 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 + # 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 + + # 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 + fi + + # Linker path is awry + # NB: Still needed ??? + #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'" + + use debug && myargs="${myargs} V=1" + + if is_cross ; then + einfo "ARCH = \"$(guess_arch)\"" + einfo "CROSS = \"${CTARGET}-\"" + emake ARCH=$(guess_arch) \ + CROSS="${CTARGET}-" \ + EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ + EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ + 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 \ + EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ + EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ + 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'" + + use debug && myargs="${myargs} V=1" + + if is_cross ; then + klibc_prefix=$("${S}/klcc/${CTARGET}-klcc" -print-klibc-prefix) + + make \ + EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ + EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ + 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 \ + EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ + EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ + 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}/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 +} + +pkg_postinst() { + # Override for linux-mod eclass + return 0 +} |