From b8a482f94fe19fcb2a0574cf170b2724eb565e2d Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Wed, 14 Nov 2007 19:06:04 +0000 Subject: Thanks to robbat2, klibc is fixed in-tree. svn path=/; revision=368 --- bugfixes/dev-libs/klibc/Manifest | 6 -- .../klibc/files/klibc-1.4.11-interp-flags.patch | 13 --- .../dev-libs/klibc/files/klibc-1.4.9-mips32.patch | 13 --- .../dev-libs/klibc/files/klibc-1.5-nostrip.patch | 1 - .../dev-libs/klibc/files/klibc-1.5-sigaction.patch | 37 ------- bugfixes/dev-libs/klibc/klibc-1.5.ebuild | 118 --------------------- 6 files changed, 188 deletions(-) delete mode 100644 bugfixes/dev-libs/klibc/Manifest delete mode 100644 bugfixes/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch delete mode 100644 bugfixes/dev-libs/klibc/files/klibc-1.4.9-mips32.patch delete mode 100644 bugfixes/dev-libs/klibc/files/klibc-1.5-nostrip.patch delete mode 100644 bugfixes/dev-libs/klibc/files/klibc-1.5-sigaction.patch delete mode 100644 bugfixes/dev-libs/klibc/klibc-1.5.ebuild diff --git a/bugfixes/dev-libs/klibc/Manifest b/bugfixes/dev-libs/klibc/Manifest deleted file mode 100644 index 34bd281..0000000 --- a/bugfixes/dev-libs/klibc/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX klibc-1.4.11-interp-flags.patch 494 RMD160 71081dc5eae8fff2adc43873f6b447f9b37a2432 SHA1 ecdea82ccbd77c63f8a65443fd64b65325869627 SHA256 ef8c05d059bc0185b8b68ea42e660fa13ddb55e9653b10fbfdabd77dea7abe2a -AUX klibc-1.4.9-mips32.patch 632 RMD160 7f9769770208f6b5e44df88f22a682b29acbad3b SHA1 a5f72d885fc191b1f6825cd525ef78472cf2d431 SHA256 546ca8b913721671767fc0c119d694ddaead20f259738ea822a295e20e4f22d3 -AUX klibc-1.5-nostrip.patch 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 SHA1 adc83b19e793491b1c6ea0fd8b46cd9f32e592fc SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b -AUX klibc-1.5-sigaction.patch 928 RMD160 00d04da5dfdf667d2ff46491212d98047adac925 SHA1 c996533744af2256c75fb7ab715a3942bf3c2768 SHA256 bd50f00b36fb4425c6921224bde5862c05fa6271c984bfadd94284cf3f5973e5 -DIST klibc-1.5.tar.bz2 487483 RMD160 9329426693c39eca2c357987bfa37656570b9d35 SHA1 254444bcc3f42855ec69b3a2497d5e6162e2fe2f SHA256 27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7 -EBUILD klibc-1.5.ebuild 3222 RMD160 9a566b4297546cbebc6ffcd111508e5d2ac27613 SHA1 37e00624f1ed6abaa7fa5f08e5f3e3aa432654f2 SHA256 74330b7470d3e2d37248a6860fcb9110cc932afbeec1edd5fa28b5599b525796 diff --git a/bugfixes/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/bugfixes/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch deleted file mode 100644 index a5bb917..0000000 --- a/bugfixes/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/bugfixes/dev-libs/klibc/files/klibc-1.4.9-mips32.patch b/bugfixes/dev-libs/klibc/files/klibc-1.4.9-mips32.patch deleted file mode 100644 index 044cb6d..0000000 --- a/bugfixes/dev-libs/klibc/files/klibc-1.4.9-mips32.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index bb018cc..4a66577 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,7 +24,7 @@ export OBJDUMP := $(KLIBCROSS)objdump - - NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include) - --ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) -+ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/parisc64/parisc/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/mips64/mips/) - export KLIBCARCH ?= $(ARCH) - export KLIBCARCHDIR := $(shell echo $(KLIBCARCH) | sed -e s/s390x/s390/) - diff --git a/bugfixes/dev-libs/klibc/files/klibc-1.5-nostrip.patch b/bugfixes/dev-libs/klibc/files/klibc-1.5-nostrip.patch deleted file mode 100644 index 8b13789..0000000 --- a/bugfixes/dev-libs/klibc/files/klibc-1.5-nostrip.patch +++ /dev/null @@ -1 +0,0 @@ - diff --git a/bugfixes/dev-libs/klibc/files/klibc-1.5-sigaction.patch b/bugfixes/dev-libs/klibc/files/klibc-1.5-sigaction.patch deleted file mode 100644 index 59f4220..0000000 --- a/bugfixes/dev-libs/klibc/files/klibc-1.5-sigaction.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - 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 -+#define _SIGNAL_H -+#else -+#include -+#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 - --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/bugfixes/dev-libs/klibc/klibc-1.5.ebuild b/bugfixes/dev-libs/klibc/klibc-1.5.ebuild deleted file mode 100644 index 7c51509..0000000 --- a/bugfixes/dev-libs/klibc/klibc-1.5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils linux-info multilib toolchain-funcs linux-mod - -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/Testing/${P}.tar.bz2" - -LICENSE="|| ( GPL-2 LGPL-2 )" -KEYWORDS="~amd64 -mips ~ppc ~x86 ~sparc" -SLOT="0" -IUSE="debug n32" - -DEPEND="dev-lang/perl - virtual/linux-sources" -RDEPEND="dev-lang/perl" - -# 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 "${KV_DIR}" 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}"/${P}-sigaction.patch - - # Prevent klibc from prestripping stuff -# epatch "${FILESDIR}"/${P}-nostrip.patch -} - -src_compile() { - local myargs - - [[ ${KV_DIR} != "${KV_OUT_DIR}" ]] && \ - myargs="KLIBCKERNELOBJ='${KV_OUT_DIR}/' KBUILD_SRC='1'" - - use debug && myargs="${myargs} V=1" - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ - HOSTCC="$(tc-getBUILD_CC)" CC="$(get-KERNEL_CC)" \ - INSTALLDIR="/usr/$(get_libdir)/klibc" \ - KLIBCARCH=$(tc-arch-kernel) \ - SHLIBDIR="/$(get_libdir)" \ - libdir="/usr/$(get_libdir)" \ - mandir="/usr/share/man" \ - ${myargs} || die "Compile failed!" -} - -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 tc-is-cross-compiler ; then - klibc_prefix=$("${S}/klcc/$(tc-arch-kernel)-klcc" -print-klibc-prefix) - else - klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix) - fi - - emake \ - HOSTCC="$(tc-getBUILD_CC)" CC="$(get-KERNEL_CC)" \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ - INSTALLDIR="/usr/$(get_libdir)/klibc" \ - INSTALLROOT="${D}" \ - KLIBCARCH=$(tc-arch-kernel) \ - SHLIBDIR="/$(get_libdir)" \ - libdir="/usr/$(get_libdir)" \ - mandir="/usr/share/man" \ - ${myargs} \ - install || die "Install failed!" - - # klibc doesn't support prelinking, so we need to mask it - cat > "${T}/70klibc" <<-EOF - PRELINK_PATH_MASK="/usr/$(get_libdir)/klibc" - EOF - - doenvd "${T}"/70klibc - - # Fix the permissions (bug #178053) on /usr/$(get_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/$(get_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 - - 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 -} -- cgit v1.2.3-65-gdbad