summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ross <aross@gentoo.org>2006-10-02 13:08:40 +0000
committerAndrew Ross <aross@gentoo.org>2006-10-02 13:08:40 +0000
commita61eaa1938ac8d0ded609f68414cfae564f2a065 (patch)
treeefaf349eecaa8714cadfe364922d0acffb85f513 /app-emulation
parentAllow compilation with gcc 4.1 (bug #147876) (diff)
downloadaross-a61eaa1938ac8d0ded609f68414cfae564f2a065.tar.gz
aross-a61eaa1938ac8d0ded609f68414cfae564f2a065.tar.bz2
aross-a61eaa1938ac8d0ded609f68414cfae564f2a065.zip
Allow compilation with gcc-4.1 (bug #147876) without breaking hardened
svn path=/; revision=16
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen-tools/Manifest8
-rw-r--r--app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild7
2 files changed, 9 insertions, 6 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index dd4f0d7..305fc5c 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -43,10 +43,10 @@ EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f
MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
-EBUILD xen-tools-3.0.2-r4.ebuild 5129 RMD160 f25fa0c8cbdf50495da03133aa4d82ed296df7b5 SHA1 8907b07d2e4e93b67bdc6ea361ccf3979aa031c1 SHA256 497c3dd81d58863cac278e071bb87c9121720b891cac78f5311edc386e609692
-MD5 7a2942ccbb78a79f6e0296737c8ef6c9 xen-tools-3.0.2-r4.ebuild 5129
-RMD160 f25fa0c8cbdf50495da03133aa4d82ed296df7b5 xen-tools-3.0.2-r4.ebuild 5129
-SHA256 497c3dd81d58863cac278e071bb87c9121720b891cac78f5311edc386e609692 xen-tools-3.0.2-r4.ebuild 5129
+EBUILD xen-tools-3.0.2-r4.ebuild 5201 RMD160 3849ba5b7e56333736aa905527accd3dd8f1f5e7 SHA1 d9c0190e1582ef1d95ef8cf42b0852ddc94ce0ee SHA256 31dc4e1697a75fbe5dd68b9f6ad951add22b2f5c3f7c3abf23d573c73a18274f
+MD5 21ef10386c8ddc2170b4cd067805aaa3 xen-tools-3.0.2-r4.ebuild 5201
+RMD160 3849ba5b7e56333736aa905527accd3dd8f1f5e7 xen-tools-3.0.2-r4.ebuild 5201
+SHA256 31dc4e1697a75fbe5dd68b9f6ad951add22b2f5c3f7c3abf23d573c73a18274f xen-tools-3.0.2-r4.ebuild 5201
MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
index ac382c5..66180e9 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -94,8 +94,11 @@ src_unpack() {
epatch "${FILESDIR}/${P}"--as-needed.patch
# Allow building with gcc-4.1 (bug #147876)
- sed -i 's/^CFLAGS += $(call test-gcc-flag,$(CC),-nopie)$/&\nCFLAGS += $(call test-gcc-flag,$(CC),-fnopie)/' \
- "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile
+ for FLAG in -fnopie -nopie -fno-stack-protector -fno-stack-protector-all ;
+ do
+ test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}"
+ done
+ sed -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile
# Allow building with python-2.5 (bug #149138)
# Backported from upstream - should be in 3.0.3