Remove -DPIC from specs, handle it by patching source with a common function fixup-DPIC()

svn path=/; revision=161

4 files changed, 17 insertions, 10 deletions

diff --git a/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass b/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass
index a5e6ca1..2055b35 100644
--- a/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass
+++ b/hardened/toolchain/branches/pieworld/eclass/toolchain-funcs.eclass
@@ -289,6 +289,9 @@ _tc_gen_usr_ldscript() {
 gen_usr_ldscript() { _tc_gen_usr_ldscript "$@" ; }
 
 
+# NOTE: This function should probably be in a different eclass - 
+# to be resolved before being committed to the main tree.
+#
 # Much assembly code is written conditional on preprocessor macro
 # PIC, which is a libtool convention and not something the toolchain
 # itself sets.  GCC has set __PIC__ for the longest time when buildling
@@ -337,7 +340,7 @@ fixup_DPIC() {
 	[[ -z ${findmatch} ]] && findop=""
 
 	case ${style} in
-	"edit")
+	"edit") # this path untested
 	find "${sourceroot}" ${findop} "${findmatch}" | \
 		xargs grep -l '^[[:space:]]*#[[:space:]]*if.*\bPIC\b' | \
 		xargs sed -s -i -n \
diff --git a/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest b/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest
index a08535b..5a582a9 100644
--- a/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest
+++ b/hardened/toolchain/branches/pieworld/sys-devel/gcc/Manifest
@@ -118,10 +118,10 @@ AUX specs/nozrelro.specs 26 RMD160 e2262ae761f699fc682536fa419a20de8e7c6096 SHA1
 MD5 3d7e9e4e50ca5244e15fecbe59aa6bb8 files/specs/nozrelro.specs 26
 RMD160 e2262ae761f699fc682536fa419a20de8e7c6096 files/specs/nozrelro.specs 26
 SHA256 a01b894e420761f5620eb050200e925a69d5e22b5fb9d34a6dbd1b5ef3e2021f files/specs/nozrelro.specs 26
-AUX specs/pie.specs 695 RMD160 37dc51ba7771c25ffaf90a8841e68f47fe90004a SHA1 fe44bbc2c0f8d7a109801d32949d96afd6808e08 SHA256 e4dce48c2264f918e548260c7870afb502ef0b8a323b2c3eed458d61395e3463
-MD5 50a9f1b56e66bbe3fd0fd7dc4bfd5d15 files/specs/pie.specs 695
-RMD160 37dc51ba7771c25ffaf90a8841e68f47fe90004a files/specs/pie.specs 695
-SHA256 e4dce48c2264f918e548260c7870afb502ef0b8a323b2c3eed458d61395e3463 files/specs/pie.specs 695
+AUX specs/pie.specs 683 RMD160 5cdec57a67e014d9dbf2564d0b6037f5c4f92beb SHA1 bba8f07fc7b8e722103bce93f414de63164ef506 SHA256 9040684e347002e13c300e158e6ea49a86fd39761de3de0ffb4602bcc8bbcb2b
+MD5 814adfa547fdc93725e7fca0a3c3e0c0 files/specs/pie.specs 683
+RMD160 5cdec57a67e014d9dbf2564d0b6037f5c4f92beb files/specs/pie.specs 683
+SHA256 9040684e347002e13c300e158e6ea49a86fd39761de3de0ffb4602bcc8bbcb2b files/specs/pie.specs 683
 AUX specs/ssp.specs 148 RMD160 0e1a23ec7c9b6be5687d620fe4c93acb532b5c3c SHA1 7f3739c35c84df458c37d3355ddf50f746bddf1f SHA256 24dddc1260d89411294c60f3464c3b3aa14b8e7f81157a03cdf40d53cb97590a
 MD5 2bf1f08a7e56492b19340fffd7e7a3fd files/specs/ssp.specs 148
 RMD160 0e1a23ec7c9b6be5687d620fe4c93acb532b5c3c files/specs/ssp.specs 148
diff --git a/hardened/toolchain/branches/pieworld/sys-devel/gcc/files/specs/pie.specs b/hardened/toolchain/branches/pieworld/sys-devel/gcc/files/specs/pie.specs
index 4a8468d..dec64d7 100644
--- a/hardened/toolchain/branches/pieworld/sys-devel/gcc/files/specs/pie.specs
+++ b/hardened/toolchain/branches/pieworld/sys-devel/gcc/files/specs/pie.specs
@@ -2,7 +2,7 @@
 %{pie:-K PIC} %{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: %{!shared: %{!nopie:-K PIC} } }}}} }}}} }
 
 *cc1_pie:
-%{pie:-fPIE -DPIC} %{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: %{!shared: %{!nopie:-fPIE -DPIC} } }}}} }}}} }
+%{pie:-fPIE} %{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: %{!shared: %{!nopie:-fPIE} } }}}} }}}} }
 
 *crtfile_pie:
 %{fno-pie|fno-PIE|nopie:crt1.o%s;:Scrt1.o%s}
diff --git a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
index 6d8399b..10bff57 100644
--- a/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
+++ b/hardened/toolchain/branches/pieworld/sys-libs/glibc/Manifest
@@ -49,10 +49,14 @@ EBUILD glibc-2.4-r4.ebuild 40802 RMD160 1f4ea04c36389c2c48dfa2cb7182a1824bb01fff
 MD5 c14e7d61ba54fd2835f7d6b6628279bc glibc-2.4-r4.ebuild 40802
 RMD160 1f4ea04c36389c2c48dfa2cb7182a1824bb01fff glibc-2.4-r4.ebuild 40802
 SHA256 a8c15fddeb4cd64075abe4e9038a40bebf4885020805de04f08e717d55290f59 glibc-2.4-r4.ebuild 40802
-EBUILD glibc-2.5.ebuild 39024 RMD160 285b5c74aace97313a3cd9316b49b11ce170f7e7 SHA1 2ae02a09393e62708fe12a19907bd39de7264086 SHA256 e7d32584584c854217236fe719ccf91d304dcf1c5eb4ebf259964d41d8ab64f9
-MD5 3a202eaf82bb96c864d93bae23f652c6 glibc-2.5.ebuild 39024
-RMD160 285b5c74aace97313a3cd9316b49b11ce170f7e7 glibc-2.5.ebuild 39024
-SHA256 e7d32584584c854217236fe719ccf91d304dcf1c5eb4ebf259964d41d8ab64f9 glibc-2.5.ebuild 39024
+EBUILD glibc-2.5.ebuild 39173 RMD160 ac90fd1906ddf7a39567c767c69fa57a21112cdd SHA1 490164416dad48c16732e2f67f4108536a5584c9 SHA256 f9bbdbd3f1764737ac60c4d7e8d6529a2de30586d77eed9744d57d967b6e262f
+MD5 473da1e93ee874ed5347e7b84c719c7d glibc-2.5.ebuild 39173
+RMD160 ac90fd1906ddf7a39567c767c69fa57a21112cdd glibc-2.5.ebuild 39173
+SHA256 f9bbdbd3f1764737ac60c4d7e8d6529a2de30586d77eed9744d57d967b6e262f glibc-2.5.ebuild 39173
+MISC .glibc-2.5.ebuild.swp 57344 RMD160 76fc83fa0c915a28c09258b93cbc581a3699f1f8 SHA1 b4e6e2a422c66a2dfc7d38c5aae87f4e72b8a29d SHA256 41fefb8f73f0c444b42f0451c77083be07908912ea4b259e9454f20b5a8138af
+MD5 b0e01665e148b75ebaf2fa3e004af550 .glibc-2.5.ebuild.swp 57344
+RMD160 76fc83fa0c915a28c09258b93cbc581a3699f1f8 .glibc-2.5.ebuild.swp 57344
+SHA256 41fefb8f73f0c444b42f0451c77083be07908912ea4b259e9454f20b5a8138af .glibc-2.5.ebuild.swp 57344
 MD5 e6c60ddb8b06199242d294f97f01c574 files/digest-glibc-2.4-r4 1575
 RMD160 49ff56b0209067c5313646df281c408956cdaa92 files/digest-glibc-2.4-r4 1575
 SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/digest-glibc-2.4-r4 1575