added back etdyn/pie support for x86. If -fstack-protector is in the users CFLAGS then let uclibc provide __guard symbols

7 files changed, 85 insertions, 12 deletions

diff --git a/dev-libs/uclibc/ChangeLog b/dev-libs/uclibc/ChangeLog
index ead16c02deeb..0ef902344d15 100644
--- a/dev-libs/uclibc/ChangeLog
+++ b/dev-libs/uclibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/uclibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.15 2004/01/03 18:00:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/ChangeLog,v 1.16 2004/01/04 05:32:52 solar Exp $
+
+*uclibc-0.9.25-r1 (04 Jan 2004)
+
+  04 Jan 2004; <solar@gentoo.org> uclibc-0.9.21.ebuild, uclibc-0.9.23.ebuild,
+  uclibc-0.9.25-r1.ebuild, uclibc-0.9.25.ebuild:
+  added back etdyn/pie support for x86. If -fstack-protector is in the users
+  CFLAGS then let uclibc provide __guard symbols
 
 *uclibc-0.9.25 (03 Jan 2004)
 
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest
index 57eb926202c5..94146151aa39 100644
--- a/dev-libs/uclibc/Manifest
+++ b/dev-libs/uclibc/Manifest
@@ -1,9 +1,9 @@
-MD5 277e124df64666b05780db86673931bc ChangeLog 3141
+MD5 22796e22c8db39933b16faef4cca43f3 ChangeLog 3140
 MD5 f694d40cf09e6c5511ae52f755a5ffe5 metadata.xml 998
-MD5 b54c28bc476bf8f847b9c866713a1f45 uclibc-0.9.23.ebuild 1396
-MD5 a373bdde6a253271781a414164652669 uclibc-0.9.25.ebuild 1060
-MD5 7296b8806ca6f6913dc35463741ba7dc uclibc-0.9.25-r1.ebuild 1654
-MD5 96c528b7057d31d29e6e290a5344d3d3 uclibc-0.9.21.ebuild 1083
+MD5 54cc65ccbad794d94d98e2bdbd4bf891 uclibc-0.9.23.ebuild 1396
+MD5 5b137b00a41ba0a5a5cf02149681b67c uclibc-0.9.25.ebuild 1059
+MD5 0c28ce2e570bd4cfd43fc04a2e3130b3 uclibc-0.9.25-r1.ebuild 1656
+MD5 016c81b475f0e47a8a529412a17a3adb uclibc-0.9.21.ebuild 1083
 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897
 MD5 07a777e28e8bdd9c29b569045e22bae1 files/digest-uclibc-0.9.25 67
 MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67
diff --git a/dev-libs/uclibc/files/digest-uclibc-0.9.25-r1 b/dev-libs/uclibc/files/digest-uclibc-0.9.25-r1
new file mode 100644
index 000000000000..f8408d7c405b
--- /dev/null
+++ b/dev-libs/uclibc/files/digest-uclibc-0.9.25-r1
@@ -0,0 +1 @@
+MD5 291986dcfe26336cd853134ff9ad5dd9 uClibc-0.9.25.tar.bz2 1602854
diff --git a/dev-libs/uclibc/uclibc-0.9.21.ebuild b/dev-libs/uclibc/uclibc-0.9.21.ebuild
index e41dfeb893d0..59aed5ddf324 100644
--- a/dev-libs/uclibc/uclibc-0.9.21.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.21.ebuild,v 1.3 2003/10/05 01:52:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.21.ebuild,v 1.4 2004/01/04 05:32:52 solar Exp $
 
 inherit eutils
 
diff --git a/dev-libs/uclibc/uclibc-0.9.23.ebuild b/dev-libs/uclibc/uclibc-0.9.23.ebuild
index 0d4064b3fb29..dc6e2100b26e 100644
--- a/dev-libs/uclibc/uclibc-0.9.23.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.23.ebuild,v 1.1 2003/11/16 00:20:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.23.ebuild,v 1.2 2004/01/04 05:32:52 solar Exp $
 
 inherit eutils
 
diff --git a/dev-libs/uclibc/uclibc-0.9.25-r1.ebuild b/dev-libs/uclibc/uclibc-0.9.25-r1.ebuild
new file mode 100644
index 000000000000..161fef6be3c7
--- /dev/null
+++ b/dev-libs/uclibc/uclibc-0.9.25-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.25-r1.ebuild,v 1.1 2004/01/04 05:32:52 solar Exp $
+
+inherit eutils
+
+MY_P="${P/ucl/uCl}"
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="http://www.uclibc.org/"
+SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2"
+IUSE="etdyn"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips"
+
+DEPEND="sys-devel/gcc"
+PROVIDE="virtual/glibc"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	local PIE=0
+	local SSP=0
+
+	unpack ${A}
+	cd ${S}
+
+	# fixup for install perms
+	sed -i -e "s:-fa:-dRf:g" Makefile
+
+	make defconfig >/dev/null || die "could not config"
+	for def in UCLIBC_{HAS_LOCALE,PROFILING} DO{DEBUG,ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do
+		sed -i "s:${def}=y:# ${def} is not set:" .config
+	done
+
+	if [ `use x86` ] ; then
+		use etdyn && PIC=1
+		[ "`is-flag -fPIC`" == "true" ] && PIC=1
+	fi
+
+	[ "`is-flag -fstack-protector`" == "true" ] && SSP=1
+	[ "`is-flag -fstack-protector-all`" == "true" ] && SSP=1
+
+	if [ "${PIC}" == 1 ] ; then
+		einfo "Enable Position Independent Executable support in ${P}"
+		sed -i -e "s:# UCLIBC_PIE_SUPPORT.*:UCLIBC_PIE_SUPPORT=y:" .config
+	fi
+	if [ "${SSP}" == 1 ]; then
+		einfo "Enable Stack Smashing Protections support in ${P}"
+		sed -i -e "s:# UCLIBC_PROPOLICE.*:UCLIBC_PROPOLICE=y:" .config
+	fi
+
+	cp .config myconfig
+
+	emake clean >/dev/null || die "could not clean"
+}
+
+src_compile() {
+	mv myconfig .config
+	emake -j1 || die "could not make"
+}
+
+src_install() {
+	emake PREFIX=${D} install || die "install failed"
+}
diff --git a/dev-libs/uclibc/uclibc-0.9.25.ebuild b/dev-libs/uclibc/uclibc-0.9.25.ebuild
index 86840efb8573..2d41edce1718 100644
--- a/dev-libs/uclibc/uclibc-0.9.25.ebuild
+++ b/dev-libs/uclibc/uclibc-0.9.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.25.ebuild,v 1.1 2004/01/03 17:58:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.25.ebuild,v 1.2 2004/01/04 05:32:52 solar Exp $
 
 inherit eutils