From 45b7749446312e2d9da063bfe81261ae4a929106 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 29 Jul 2014 18:00:24 +0200 Subject: dev-libs/dietlibc: Version bump, sync with upstream, do env check in pkg_setup, remove unneeded patchs Package-Manager: portage-2.2.10 --- dev-libs/dietlibc/ChangeLog | 10 +- dev-libs/dietlibc/Manifest | 7 +- dev-libs/dietlibc/dietlibc-0.33.ebuild | 95 ------------------ dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild | 108 +++++++++++++++++++++ dev-libs/dietlibc/files/0.33-BJA-nostrip.diff | 69 ------------- 5 files changed, 120 insertions(+), 169 deletions(-) delete mode 100644 dev-libs/dietlibc/dietlibc-0.33.ebuild create mode 100644 dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild delete mode 100644 dev-libs/dietlibc/files/0.33-BJA-nostrip.diff (limited to 'dev-libs') diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog index 7ce3150a..02ab0d1c 100644 --- a/dev-libs/dietlibc/ChangeLog +++ b/dev-libs/dietlibc/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for dev-libs/dietlibc -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*dietlibc-0.34_pre20140729 (29 Jul 2014) + + 29 Jul 2014; Bertrand Jacquin + +dietlibc-0.34_pre20140729.ebuild, -dietlibc-0.33.ebuild, + -files/0.33-BJA-nostrip.diff: + dev-libs/dietlibc: Version bump, sync with upstream, do env check in + pkg_setup, remove unneeded patchs + *dietlibc-0.33 (22 Nov 2013) 22 Nov 2013; Bertrand Jacquin +dietlibc-0.33.ebuild, diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest index b24fb4a4..bcfdede9 100644 --- a/dev-libs/dietlibc/Manifest +++ b/dev-libs/dietlibc/Manifest @@ -1,5 +1,4 @@ -AUX 0.33-BJA-nostrip.diff 3266 SHA256 461bb278cd845dc2af8d808b1463b74c18d15d3e2974da5994f5338348e52d0a WHIRLPOOL a9c8e143770c85200f9a6656585967282f85cf5c4cfd90271f8148233b19badcc93fdf723c345bfcb032b72f8712ea39dde504cd18de8c914bac02acd00465c8 -DIST dietlibc-0.33.tar.bz2 626885 SHA256 68838893790ddd7a42bc1a06e5435054e1dc1914e4b53d2d6c92f603d3b315f5 WHIRLPOOL d6f11ce9a5d2624db6be028505a0c9c3d50ca1fa1d556dc76c9f2e52a0223bd7316e7e9234b01a4e67cb256bd5ee466770fd32c0569f09661e2960201378ab8e -EBUILD dietlibc-0.33.ebuild 2223 SHA256 40c78f8447566080a5232aa540df75e99f4faede770a766e1db847d010fa0fb5 WHIRLPOOL 0f5f17d2f11e2959a6bdeed96dd775e1706a72b5f0f133d29a7a077e63d684709caa729f27828dc826c078e0d5694b056f2b9cfe4e17398ce64f0c71b5c3f272 -MISC ChangeLog 1542 SHA256 01dafd03a161aebf6b4d9a11c822c2d463c2322561ae5b13740e6ba96c757de8 WHIRLPOOL fdb91eca04b73eafbbb9e82a9a2a9193e9e796eb39924210cf232d9387a86b88937f1b2a0d491bae5b33386282a5752a890197f441ac4748e837d963ffc99247 +DIST dietlibc-0.34_pre20140729.tar.bz2 670195 SHA256 d6693610c756dbfc070c0ffed5a75e1ddab8d119394962ca1ed4d42f34b57318 WHIRLPOOL 566e505a65e3f81c5507fc494324b4f48e5af27683d69c443cf7d2380599a24bbc984d7d430acb25bc0d28baa924565ee513c8217dd2eb6a960c70d6d2a7e1b7 +EBUILD dietlibc-0.34_pre20140729.ebuild 2435 SHA256 1cfe4af688a4a517192f31fd37bed16d05709b901d4b3c2d95bfc9d3ead509c0 WHIRLPOOL e76aa757d21f91747ae4f037deabe5e063b4aa8b5f3081b843d8a6ea1150559a9705bd6b0d546fcc02e6cf961533c44003ed68cab20f4176383be390e76be105 +MISC ChangeLog 1837 SHA256 d1f78e660f47d3aeed77903d816d579f472e30c36bdfb7571aa4d4682a3bd4a1 WHIRLPOOL 3d0fbc53dc0c482e8b85f10abc58a1b321bc13ba36da223b69aed5f5f00b72da190e1be5803a0d90f5221d8e662a92356a518cf5fb0b3630665934e34d955f95 MISC metadata.xml 1531 SHA256 fb7109720df2fe3b35ea81ba236af5b4dd5a3e04d14862af7e95e4564946bbd9 WHIRLPOOL 37e88b6edff9b9434aa3cb491e661b52890463bdbfdb7bbea5f5b024d198b4f5c93e3d93c0c186e67cc09f89d3038fbbe1c0683a8cc481343c4599d624dfc8d6 diff --git a/dev-libs/dietlibc/dietlibc-0.33.ebuild b/dev-libs/dietlibc/dietlibc-0.33.ebuild deleted file mode 100644 index 3813fc2e..00000000 --- a/dev-libs/dietlibc/dietlibc-0.33.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33.ebuild,v 1.1 2013/10/13 15:15:44 polynomial-c Exp $ - -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A libc optimized for small size" -HOMEPAGE="http://www.fefe.de/dietlibc/" -SRC_URI="http://www.fefe.de/dietlibc/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="" -RDEPEND="" - -DIETHOME=/usr/diet - -IUSE_LIBC_TARGET="alpha arm armeb i386 ia64 mips mipsel parisc parisc64 ppc ppc64 s390 s390x sparc sparc64 x86_64" - -for t in ${IUSE_LIBC_TARGET} ; do - IUSE="${IUSE} target_${t}" -done - -src_prepare() { - epatch "${FILESDIR}/${PV}-BJA-nostrip.diff" -} - -diet_flags() { - # Reset CFLAGS - CFLAGS="" - - # Replace sparc64 related C[XX]FLAGS (see bug #45716) - use sparc && replace-sparc64-flags - - # gcc-hppa suffers support for SSP, compilation will fail - use hppa && strip-unsupported-flags - - # Makefile does not append CFLAGS - append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \ - -Wmissing-prototypes -Wmissing-declarations -Wno-switch \ - -Wno-unused -Wredundant-decls -fno-strict-aliasing - - # only use -nopie on archs that support it - gcc-specs-pie && append-flags -nopie - - append-flags -Wa,--noexecstack -} - -src_compile() { - for t in ${IUSE_LIBC_TARGET} ; do - use target_$t $USE || continue - - tC="CROSS_$t" - if [ -z "${!tC}" ] ; then - ewarn "CROSS_$t not defined, can't build" - sleep 15 - continue - fi - - CHOST="$t" - diet_flags - - einfo "Building libc $t" - emake prefix="${EPREFIX}"${DIETHOME} \ - MYARCH="${t}" \ - CROSS="${!tC}" \ - CFLAGS="${CFLAGS}" - done -} - -src_install() { - emake prefix="${EPREFIX}"${DIETHOME} \ - DESTDIR="${ED}" \ - install-headers - - for t in ${IUSE_LIBC_TARGET} ; do - use target_$t $USE || continue - - einfo "Installing libc $t" - emake prefix="${EPREFIX}"${DIETHOME} \ - MYARCH="${t}" \ - DESTDIR="${ED}" \ - install-bin - done - - dobin "${ED}"${DIETHOME}/bin/* - doman "${ED}"${DIETHOME}/man/*/* - rm -r "${ED}"${DIETHOME}/{man,bin} || die - - dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING -} diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild new file mode 100644 index 00000000..a6d22f35 --- /dev/null +++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild,v 1.2 2014/07/29 09:15:25 patrick Exp $ + +EAPI=5 +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="A libc optimized for small size" +HOMEPAGE="http://www.fefe.de/dietlibc/" +SRC_URI="http://dev.gentoo.org/~patrick/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +DEPEND="" +RDEPEND="" + +DIETHOME=/usr/diet + +S=${WORKDIR}/dietlibc + +IUSE_LIBC_TARGET="alpha arm armeb i386 ia64 mips mipsel parisc parisc64 ppc ppc64 s390 s390x sparc sparc64 x86_64" + +for t in ${IUSE_LIBC_TARGET} ; do + IUSE="${IUSE} target_${t}" +done + +pkg_setup() { + local _WARNING=0 + + for t in ${IUSE_LIBC_TARGET} ; do + use "target_${t}" || continue + + tC="CROSS_$t" + [[ "${!tC}" ]] && continue + + ewarn "CROSS_$t not defined, can't build" + (( _WARNING++ )) + done + + if (( _WARNING != 0 )) ; then + die "Environnement is not ready for build, see above" + fi +} + +diet_flags() { + # Reset CFLAGS + CFLAGS="" + + # Replace sparc64 related C[XX]FLAGS (see bug #45716) + use sparc && replace-sparc64-flags + + # gcc-hppa suffers support for SSP, compilation will fail + use hppa && strip-unsupported-flags + + # Makefile does not append CFLAGS + append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \ + -Wmissing-prototypes -Wmissing-declarations -Wno-switch \ + -Wno-unused -Wredundant-decls -fno-strict-aliasing + + # only use -nopie on archs that support it + gcc-specs-pie && append-flags -nopie + + append-flags -Wa,--noexecstack +} + +src_compile() { + for t in ${IUSE_LIBC_TARGET} ; do + use "target_${t}" || continue + + CHOST="${t}" + diet_flags + + tC="CROSS_$t" + + einfo "Building libc ${t}" + emake prefix="${EPREFIX}${DIETHOME}" \ + MYARCH="${t}" \ + CROSS="${!tC}" \ + CFLAGS="${CFLAGS}" \ + STRIP=: + done +} + +src_install() { + emake prefix="${EPREFIX}${DIETHOME}" \ + DESTDIR="${ED}" \ + install-headers + + for t in ${IUSE_LIBC_TARGET} ; do + use "target_${t}" || continue + + einfo "Installing libc ${t}" + emake prefix="${EPREFIX}${DIETHOME}" \ + MYARCH="${t}" \ + DESTDIR="${ED}" \ + install-bin \ + install-profiling + done + + dobin "${ED}${DIETHOME}"/bin/* + doman "${ED}${DIETHOME}"/man/*/* + rm -r "${ED}${DIETHOME}"/{man,bin} || die + + dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING +} diff --git a/dev-libs/dietlibc/files/0.33-BJA-nostrip.diff b/dev-libs/dietlibc/files/0.33-BJA-nostrip.diff deleted file mode 100644 index d6fec1a5..00000000 --- a/dev-libs/dietlibc/files/0.33-BJA-nostrip.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- Makefile.ori 2013-06-10 18:20:59.431140867 +0200 -+++ Makefile 2013-06-10 18:21:15.203480123 +0200 -@@ -163,7 +163,6 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h - - $(OBJDIR)/%.o: %.c - tcc -I. -Iinclude -c $< -o $@ -- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@ - else - $(OBJDIR)/pstart.o: start.S - $(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@ -@@ -173,11 +172,9 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h - - $(OBJDIR)/pthread_%.o: libpthread/pthread_%.c - $(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@ - - $(OBJDIR)/%.o: %.c - $(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__ -- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@ - endif - - ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0) -@@ -247,18 +244,15 @@ $(PICODIR)/%.o: %.S $(ARCH)/syscalls.h - - $(PICODIR)/pthread_%.o: libpthread/pthread_%.c - $(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@ -- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@ - - $(PICODIR)/%.o: %.c - $(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@ -- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@ - - $(PICODIR)/dstart.o: start.S - $(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@ - - $(PICODIR)/dyn_so_start.o: dyn_start.c - $(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@ -- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@ - - DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \ - $(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ) -@@ -310,19 +304,15 @@ CURNAME=$(notdir $(shell pwd)) - - $(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o - $(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -DVERSION=\"$(VERSION)\" -lgcc -- $(CROSS)strip -R .comment -R .note $@ - - $(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o - $(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc -- $(CROSS)strip -R .comment -R .note $@ - - $(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c - $(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(HOME)/$(PICODIR)/libdl.so -- $(CROSS)strip -R .command -R .note $@ - - $(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c - $(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION -- $(CROSS)strip -R .command -R .note $@ - - $(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load - -@@ -535,7 +525,6 @@ $(OBJDIR)/fcntl64.o: dietfeatures.h - # This facepalm brought to you by: Ubuntu! - $(OBJDIR)/stackgap.o: lib/stackgap.c dietfeatures.h - $(CROSS)$(CC) $(INC) $(CFLAGS) -c lib/stackgap.c -o $@ -D__dietlibc__ -fno-stack-protector -- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@ - - # WANT_MALLOC_ZERO - $(OBJDIR)/strndup.o: dietfeatures.h -- cgit v1.2.3