Version bump, add debug support, do CFLAGS properly, do gcc3[34] patch properly, ssp.c merged upstream, mips in unstable, and add cross-compile stuff.

5 files changed, 123 insertions, 16 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index b703fcd46546..de7fbb3a3c87 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.36 2004/08/21 21:25:36 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.37 2004/10/01 21:23:53 robbat2 Exp $
+
+*dietlibc-0.27 (01 Oct 2004)
+
+  01 Oct 2004; Robin H. Johnson <robbat2@gentoo.org> +files/gcc-33-r2.patch,
+  +dietlibc-0.27.ebuild:
+  Version bump, add debug support, do CFLAGS properly, do gcc3[34] patch
+  properly, ssp.c merged upstream, mips in unstable, and add cross-compile
+  stuff.
 
 *dietlibc-0.26-r1 (21 Aug 2004)
 
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 7fb43332d539..5d05058c076e 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,24 +1,27 @@
-MD5 62809adc0f6b86ea26c2477ff9e19491 ChangeLog 5274
-MD5 3d41aba8c10497c03a05a30e45354fac dietlibc-0.22-r2.ebuild 1671
 MD5 8932d3210d2ef48dd92f04163496b435 dietlibc-0.23.ebuild 1768
-MD5 4c9ccfb0fee56c64ef08e51f538c9d9c dietlibc-0.24.ebuild 1523
 MD5 79afa48848ac801ba5026f84dccecf80 dietlibc-0.25.ebuild 1566
-MD5 92ee3a5ce823df484a1d6d90044fa07c dietlibc-0.26-r1.ebuild 1933
-MD5 8de66752df8ab2859aa5fa2a544a09b7 dietlibc-0.26.ebuild 1573
+MD5 92ee3a5ce823df484a1d6d90044fa07c dietlibc-0.27.ebuild 1933
+MD5 589da6fab80698a3a1f008d4ca85789c dietlibc-0.26-r2.ebuild 2129
+MD5 3d41aba8c10497c03a05a30e45354fac dietlibc-0.22-r2.ebuild 1671
+MD5 4c9ccfb0fee56c64ef08e51f538c9d9c dietlibc-0.24.ebuild 1523
+MD5 62809adc0f6b86ea26c2477ff9e19491 ChangeLog 5274
 MD5 6d7429e88eda74e2e5a1d89dcda32c33 metadata.xml 400
-MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
-MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
-MD5 02d59156de2a7a0f914dc5769e26cdcf files/0.25-gcc34.patch 3454
-MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
-MD5 4713f8664ff94fb53c7696d9204406ed files/dietlibc-0.23-hppa.patch 3954
-MD5 9022467ec4210d62330f0eb1d8c93394 files/dietlibc-0.26-ssp.patch 1632
+MD5 8de66752df8ab2859aa5fa2a544a09b7 dietlibc-0.26.ebuild 1573
 MD5 8c25662fd30d966f24ec20ef491075a6 files/dietlibc-sparc64-makefile.patch 499
+MD5 4713f8664ff94fb53c7696d9204406ed files/dietlibc-0.23-hppa.patch 3954
+MD5 8dcca4f3b79565a3c205dbb0ef2d20bd files/ssp.c 4038
 MD5 2644f8611fcb7a147ec9ef76eaf5992a files/digest-dietlibc-0.22-r2 66
+MD5 4c8bea996353605b5d0b6184d8836ffe files/digest-dietlibc-0.26-r1 66
+MD5 67b93dd4033c0e66d42b6bade33c73fc files/dietlibc-0.22_xdr_security_fix.patch 5566
+MD5 9022467ec4210d62330f0eb1d8c93394 files/dietlibc-0.26-ssp.patch 1632
+MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.24-dirent-prototype.patch 668
+MD5 2d0f660abd258d75417ef8abd8ab5eb7 files/0.23-dirent-prototype.patch 668
+MD5 e33c0d8f3c56f85d1caa98118824fceb files/0.22-dirent-prototype.patch 563
 MD5 b06d21ffc62c7a660a29351e55213a0b files/digest-dietlibc-0.23 66
 MD5 11048a235efe4eefcfffc4ccffa60821 files/digest-dietlibc-0.24 66
 MD5 a6911c79e510ea03173a809f5d7e6a40 files/digest-dietlibc-0.25 66
 MD5 4c8bea996353605b5d0b6184d8836ffe files/digest-dietlibc-0.26 66
-MD5 4c8bea996353605b5d0b6184d8836ffe files/digest-dietlibc-0.26-r1 66
-MD5 9247251c0adc5ce1b626d7092ae0c903 files/gcc-33.patch 482
-MD5 8dcca4f3b79565a3c205dbb0ef2d20bd files/ssp.c 4038
+MD5 771865efe3795f379b15c0bb6d61a857 files/digest-dietlibc-0.27 66
+MD5 02d59156de2a7a0f914dc5769e26cdcf files/0.25-gcc34.patch 3454
+MD5 ea791631782529db92c7b23198391a7a files/gcc-33-r2.patch 1077
diff --git a/dev-libs/dietlibc/dietlibc-0.27.ebuild b/dev-libs/dietlibc/dietlibc-0.27.ebuild
new file mode 100644
index 000000000000..15facdaf0166
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.27.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.27.ebuild,v 1.1 2004/10/01 21:23:53 robbat2 Exp $
+
+inherit eutils flag-o-matic fixheadtails gcc
+
+DESCRIPTION="A minimal libc"
+HOMEPAGE="http://www.fefe.de/dietlibc/"
+SRC_URI="mirror://kernel/linux/libs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~mips"
+IUSE="debug"
+
+DEPEND=">=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/0.24-dirent-prototype.patch"
+	# wanted for gcc3.3 and gcc3.4 - robbat2 (Oct 01 2004)
+	[ $(gcc-major-version) -le 3 ] \
+		&& epatch ${FILESDIR}/gcc-33-r2.patch
+#		&& epatch ${FILESDIR}/${PV}-gcc34.patch
+
+	# depending on glibc to provide guard symbols, does not work with -nostdlib
+	# building
+	filter-flags -fstack-protector -fstack-protector-all
+
+	# ${FILESDIR}/ssp.c is integrated with upstream as of dietlibc-0.26
+	# - robbat2 (Oct 01 2004)
+
+	# start with sparc/sparc64/x86_64/i386 for now.
+	# apply to all arches for crazy cross-compiling - robbat2 (Oct 01 2004)
+	epatch ${FILESDIR}/dietlibc-0.26-ssp.patch
+	append-flags -D__dietlibc__
+	# end ssp block code
+
+	# Fix for 45716
+	replace-sparc64-flags
+
+	# be very careful to only effect the CFLAGS used for optimization
+	# and not any of the other CFLAGS. - robbat2 (Oct 01 2004)
+	sed -i \
+		-e "s:^CFLAGS+=-O -fomit-frame-pointer:CFLAGS += ${CFLAGS}:" \
+		-e "s:^prefix.*:prefix=/usr/diet:" \
+		Makefile \
+		|| die "sed Makefile failed"
+
+	# New fix for sparc64 and dietlibc, fixes bug #45601
+	# Apply to all arches for crazy cross-compiling - robbat2 (Oct 01 2004)
+	epatch ${FILESDIR}/dietlibc-sparc64-makefile.patch
+
+	ht_fix_all
+}
+
+src_compile() {
+	local emake_opt=""
+	use debug  && emake_opt='DEBUG=1'
+	emake ${emake_opt} || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+
+	exeinto /usr/bin
+	newexe bin-$(uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-9][lb]/arm/' -e 's/sparc64/sparc/')/diet-i diet || die "newexe failed"
+
+	doman diet.1
+	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
+}
diff --git a/dev-libs/dietlibc/files/digest-dietlibc-0.27 b/dev-libs/dietlibc/files/digest-dietlibc-0.27
new file mode 100644
index 000000000000..4647fc743ddd
--- /dev/null
+++ b/dev-libs/dietlibc/files/digest-dietlibc-0.27
@@ -0,0 +1 @@
+MD5 cd90fae1bf6c217889c0f89d2d0c1570 dietlibc-0.27.tar.bz2 527396
diff --git a/dev-libs/dietlibc/files/gcc-33-r2.patch b/dev-libs/dietlibc/files/gcc-33-r2.patch
new file mode 100644
index 000000000000..4e85e2758be0
--- /dev/null
+++ b/dev-libs/dietlibc/files/gcc-33-r2.patch
@@ -0,0 +1,22 @@
+I don't know who wrote the original gcc-33.patch, but it radically changes the
+meaning of the flags. The -m prefix for the following changed to -f, but the
+behaviour stayed the same.
+Passing a 0 or no number with the arguments means to use the default value for
+that machine, which is definetly not what we want to do.
+We explictly want an alignment of '1' (no alignment at all) as opposed to the
+default alignment. On a machine with a large default alignment that would be
+otherwise used, this results in a lot of wasted space.
+= Robin H. Johnson (robbat2@gentoo.org) - October 01, 2004.
+--- diet.c	2003-10-10 15:17:46.000000000 +0200
++++ diet.c	2004-02-15 19:03:01.000000000 +0100
+@@ -26,8 +26,8 @@
+ 
+ static const char* Os[] = {
+   "i386","-Os","-mpreferred-stack-boundary=2",
+-	 "-malign-functions=1","-malign-jumps=1",
+-	 "-malign-loops=1","-fomit-frame-pointer",0,
++	 "-falign-functions=1","-falign-jumps=1",
++	 "-falign-loops=1","-fomit-frame-pointer",0,
+   "x86_64","-Os","-fno-omit-frame-pointer",0,
+   "sparc","-Os","-mcpu=supersparc",0,
+   "sparc64","-Os","-m64",0,