fix -nopie wrt #325539

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 68 insertions, 7 deletions

diff --git a/dev-libs/dietlibc/ChangeLog b/dev-libs/dietlibc/ChangeLog
index b930ca0f2927..926251dfc91c 100644
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/dietlibc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.80 2009/08/24 15:42:30 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.81 2010/06/26 06:06:55 hollow Exp $
+
+*dietlibc-0.33_pre20100626 (26 Jun 2010)
+
+  26 Jun 2010; Benedikt Böhm <hollow@gentoo.org>
+  dietlibc-0.33_pre20090721.ebuild, +dietlibc-0.33_pre20100626.ebuild:
+  fix -nopie wrt #325539
 
   24 Aug 2009; Benedikt Böhm <hollow@gentoo.org>
   -dietlibc-0.32_pre20081116.ebuild, dietlibc-0.33_pre20090721.ebuild:
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index b53076c1f6a3..c63d9e34b463 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -8,10 +8,12 @@ DIST dietlibc-0.28.tar.bz2 560540 RMD160 242cbcd5b7e7f341713f587598cddc9d6ee39f5
 DIST dietlibc-0.30-patches-r0.tar.bz2 13466 RMD160 aef639595e93bd319744901aa87ae15d331709f2 SHA1 f71163605ea54cef6a336a2c360beec38234858e SHA256 bdc14a428b53dcd57bbce2337198e43473964624021d5a4918c5147753e75251
 DIST dietlibc-0.30.tar.bz2 567046 RMD160 98d4e20e106f60835ed4a22d3013d9a34957f18a SHA1 cab8631f8ca1902d6668584f72f71706bee020eb SHA256 2c8733825d364d374f0179a403a57e4a382fbb9852431228ef19062a5de183b5
 DIST dietlibc-0.33_pre20090721.tar.bz2 587935 RMD160 1122b52aad5042454a6c3d4d8a180e51384294ca SHA1 55f6c372c720ca88bcaa523f5e590b65243cebdc SHA256 761d9c84b335a60546beae53695979196d60d2569f42daa4d112e01c1df122df
+DIST dietlibc-0.33_pre20100626.tar.bz2 596013 RMD160 70fdd9ce982c2e5fe57189583cf8bffd19eaef54 SHA1 5aa7d10aae4f95af34e9184acdd725cf90f56a22 SHA256 62ae548997c6ccd05f5e2df8e96b36f517674b9e0fe6a1797c1eb892f7985a88
 DIST dietlibc-patches-0.30-r2.tar.bz2 31582 RMD160 6cd2a89cb47131360ed6e6a8cbcbe79aad84b18a SHA1 9c0bb84a7449edbfaccf0cbe694ccf8f57e26566 SHA256 03a3ea9bba39fb78511a59e80bcbdafdc82a0859b31b6af925854052a79f06fe
 EBUILD dietlibc-0.28.ebuild 1574 RMD160 477bbf6ac0ac6a8c88ecec756f9ac7cd76aa381c SHA1 19e09f5fc6951ed45a1a057a337e7f73ef86e069 SHA256 3c7622b1aeef75690a38a0a7ea3e937043a3c6e6b0a04a3687c3ee64cb3c90f9
 EBUILD dietlibc-0.30-r2.ebuild 1495 RMD160 ff2129e72221ba0c48af10c1a7914d3d756357fa SHA1 d504b63210f2ecbf19c8110ad19c54b56f7d9b90 SHA256 590eeea02efef70d952a34af892e797366dc5c05c9a01547795180a51ea77c4e
 EBUILD dietlibc-0.30.ebuild 1313 RMD160 20799b3ac51920bc5b3f9fd8216ce3cd72d690d4 SHA1 4bf3749e2c24bb186fde24104dab8b21b5762b01 SHA256 dc11441e50be541b55358f24d8a4c092968938d0c546bc905cf39b5b8416866c
-EBUILD dietlibc-0.33_pre20090721.ebuild 1417 RMD160 b4148a98e725f780ac06e05670c4f7d0e04da2ad SHA1 2be7705e49433193b3604102c6121832fd6df3e3 SHA256 5b920c946a015fb5e6b815061cc2e4b57bb20a197116d8d9430552511253ea85
-MISC ChangeLog 11768 RMD160 69c61ee5d942be1b4b9043b668db113299a89099 SHA1 d3e9bcd3ce2de8de865d403155ae278978d00d3c SHA256 f1b63eb5e2b54e2cb0389be6736ee43ac9454cecdd8e49c92e9cb755d8f36481
+EBUILD dietlibc-0.33_pre20090721.ebuild 1493 RMD160 134b74e0e9b9927f768e28858be651ef532ed76f SHA1 35f0ccb9edc80f22ed22258b2fc4f56077401888 SHA256 9dbf1742b9e9d204dc8e05422f24b691a68600558ab070285ae5c000a9ca94b5
+EBUILD dietlibc-0.33_pre20100626.ebuild 1493 RMD160 bfbcc59218f8fc52271751c18745994c33e484b4 SHA1 d2a2cb3e2406e77515e506908ee6efa5a96ab1d1 SHA256 99107bf90e5570f1f0d18f6207f22f9481222f940b1e8d8f04fbca54669407a6
+MISC ChangeLog 11957 RMD160 491fe266fd42b025dc5f35c9c8980a6ad3203112 SHA1 2b5c0fdf3b16e478008d764b027e77103ce61e9e SHA256 7009bb3fdbeb00d212e59beb493ee83fcb4bac81eb18c45bd074a457a513d080
 MISC metadata.xml 410 RMD160 063e81d4d38be2fa6f093828b42a0ee3e5b2b582 SHA1 e73d09647dcac3413d7bccb6f1d2a0bc50e60f48 SHA256 3fc38345f9430d71c6369f84fc1b6248bc8aa0ec74cb4ae5b2797fe01cf48721
diff --git a/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild b/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild
index 83f982ebfb72..b0adc3603ad3 100644
--- a/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild,v 1.2 2009/08/24 15:42:30 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20090721.ebuild,v 1.3 2010/06/26 06:06:55 hollow Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -31,7 +31,10 @@ pkg_setup() {
 	# Makefile does not append CFLAGS
 	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
 		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
-		-Wno-unused -Wredundant-decls -nopie
+		-Wno-unused -Wredundant-decls
+
+	# only use -nopie on archs that support it
+	gcc-specs-pie && append-flags -nopie
 }
 
 src_compile() {
diff --git a/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild b/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild
new file mode 100644
index 000000000000..7dcbe3233964
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20100626.ebuild,v 1.1 2010/06/26 06:06:55 hollow Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A minimal libc"
+HOMEPAGE="http://www.fefe.de/dietlibc/"
+SRC_URI="http://bb.xnull.de/projects/dietlibc/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND=""
+
+DIETHOME=/usr/diet
+
+pkg_setup() {
+	# 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
+
+	# debug flags
+	use debug && append-flags -g
+
+	# Makefile does not append CFLAGS
+	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
+		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
+		-Wno-unused -Wredundant-decls
+
+	# only use -nopie on archs that support it
+	gcc-specs-pie && append-flags -nopie
+}
+
+src_compile() {
+	emake prefix=${DIETHOME} CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -j1 || die "make failed"
+}
+
+src_install() {
+	emake prefix=${DIETHOME} DESTDIR="${D}" -j1 install || die "make install failed"
+	dobin "${D}"${DIETHOME}/bin/* || die "dobin failed"
+	doman "${D}"${DIETHOME}/man/*/* || die "doman failed"
+	rm -r "${D}"${DIETHOME}/{man,bin}
+	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
+}