summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice van der Pot <griffon26@gentoo.org>2005-12-05 18:37:01 +0000
committerMaurice van der Pot <griffon26@gentoo.org>2005-12-05 18:37:01 +0000
commitad8c2a44b8230c1a7edc8431002e7b49eca90efe (patch)
treedde22b36d3bd72a24333362fd6512efb476e49ce /dev-util
parentMarked stable on amd64 (diff)
downloadhistorical-ad8c2a44b8230c1a7edc8431002e7b49eca90efe.tar.gz
historical-ad8c2a44b8230c1a7edc8431002e7b49eca90efe.tar.bz2
historical-ad8c2a44b8230c1a7edc8431002e7b49eca90efe.zip
Filtering out -fstack-protector for valgrind 3.1.0 (bug #114347)
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/valgrind/ChangeLog8
-rw-r--r--dev-util/valgrind/Manifest10
-rw-r--r--dev-util/valgrind/valgrind-3.1.0.ebuild21
3 files changed, 27 insertions, 12 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 4bc3030ca0a3..82da042f46e0 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/valgrind
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.55 2005/12/02 21:51:28 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.56 2005/12/05 18:37:01 griffon26 Exp $
+
+ 03 Dec 2005; Maurice van der Pot <griffon26@gentoo.org>
+ valgrind-3.1.0.ebuild:
+ Filtering out -fstack-protector again, because otherwise valgrind would need
+ __guard and __stack_smash_handler from glibc, which it doesn't link to.
+ Closes bug #114347 reported by Graham Murray <graham@gmurray.org.uk>
*valgrind-3.1.0 (02 Dec 2005)
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 9e9d61cefd42..5ee2a9aedd09 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 445cfd5528655f9e1f5542db8cae374a ChangeLog 6420
+MD5 df3003fc7d32d481b23fe4125bdc60f5 ChangeLog 6728
MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139
MD5 c6fe697b4c25fb9e5c7482496ebabf06 files/digest-valgrind-2.4.0 140
MD5 a5dde62cbb4bb255219643b61493b950 files/digest-valgrind-2.4.1 68
@@ -24,11 +24,11 @@ MD5 cb18085a00f509803e6e539543cb20f9 valgrind-2.4.1.ebuild 1881
MD5 16efe20081a8edc14768a1ea1e4664be valgrind-3.0.0.ebuild 1799
MD5 c824aeed84391f896caea42dc444afc6 valgrind-3.0.1-r1.ebuild 1887
MD5 fc311d6ac7b19d831f6e18e9588c2053 valgrind-3.0.1.ebuild 1690
-MD5 3a737b3b128b85f625cc46cc42712ec7 valgrind-3.1.0.ebuild 1690
+MD5 0cb8b50fb0b3ea6de23044336c0126b0 valgrind-3.1.0.ebuild 2172
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDkMHvMGnpIbeahxwRAidzAJ9mJII9ll5tTjJ/emCQW9TeSL2IKQCgoVGl
-3NqtY8YADTkEebDjIFvWupY=
-=Mgb3
+iD8DBQFDlIjcMGnpIbeahxwRAiOuAJ42Idr0CWGsfLftODoGqHAg04fMWQCgrruP
+x0qX9xuVSxynxHpxx950fgk=
+=Af7M
-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/valgrind-3.1.0.ebuild b/dev-util/valgrind/valgrind-3.1.0.ebuild
index 3ceacc460224..53da3ed7fb77 100644
--- a/dev-util/valgrind/valgrind-3.1.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.1.0.ebuild,v 1.1 2005/12/02 21:51:28 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.1.0.ebuild,v 1.2 2005/12/05 18:37:01 griffon26 Exp $
inherit eutils flag-o-matic
@@ -21,11 +21,19 @@ src_unpack() {
cd "${S}"
# make sure our CFLAGS are respected
- einfo "Changing configure to respect CFLAGS"
- sed -i -e 's:CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure
+ einfo "Changing configure.in to respect CFLAGS"
+ sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+
+ # undefined references to __guard and __stack_smash_handler in VEX (bug #114347)
+ einfo "Changing Makefile.flags.am to disable SSP"
+ sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.flags.am
# Correct hard coded doc location
- sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.in
+ sed -i -e "s:doc/valgrind/:doc/${P}/:" docs/Makefile.am
+
+ einfo "Regenerating autotools files..."
+ autoconf || die "autoconf failed"
+ automake || die "automake failed"
}
src_compile() {
@@ -35,11 +43,12 @@ src_compile() {
# while compiling insn_sse.c in none/tests/x86
# -fpie valgrind seemingly hangs when built with pie on
# amd64 (bug #102157)
- # -fstack-protector ???
+ # -fstack-protector more undefined references to __guard and __stack_smash_handler
+ # because valgrind doesn't link to glibc (bug #114347)
# -ggdb3 segmentation fault on startup
filter-flags -fomit-frame-pointer
filter-flags -fpie
- #filter-flags -fstack-protector
+ filter-flags -fstack-protector
replace-flags -ggdb3 -ggdb2
# Optionally build in X suppression files