diff options
| author |   Maurice van der Pot <griffon26@gentoo.org> | 2009-11-16 20:49:18 +0000 |
|---|---|---|
| committer | Maurice van der Pot <griffon26@gentoo.org> | 2009-11-16 20:49:18 +0000 |
| commit | 73bd5cf03e4daeeacbeee9b5db4ab00c92feade2 (patch) | |
| tree | 5aadb14298d0e5131fa727dadf6bcc5b19192d69 /dev-util | |
| parent | Remove app-misc/git, new name is app-misc/gnuit. Part of bug 287863 (diff) | |
| download | gentoo-2-73bd5cf03e4daeeacbeee9b5db4ab00c92feade2.tar.gz gentoo-2-73bd5cf03e4daeeacbeee9b5db4ab00c92feade2.tar.bz2 gentoo-2-73bd5cf03e4daeeacbeee9b5db4ab00c92feade2.zip | |
Fix compilation of valgrind-3.5.0 on systems without a secondary arch (bug #293169).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/valgrind/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch | 18 |
2 files changed, 18 insertions, 8 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog index 6b0b03677888..db19ee90ee62 100644 --- a/dev-util/valgrind/ChangeLog +++ b/dev-util/valgrind/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/valgrind # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.108 2009/11/08 00:28:35 griffon26 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.109 2009/11/16 20:49:18 griffon26 Exp $ + + 16 Nov 2009; Maurice van der Pot <griffon26@gentoo.org> + files/valgrind-3.5.0-non-exec-stack.patch: + Corrected non-exec-stack patch for platforms without a secondary architecture + (bug #293169 reported by Denys <nuclearcat@nuclearcat.com>). + Thanks to Mattias Nissler <mattias.nissler@gmx.de> for the patch. 08 Nov 2009; Maurice van der Pot <griffon26@gentoo.org> valgrind-3.5.0.ebuild, +files/valgrind-3.5.0-glibc-2.11.patch, diff --git a/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch index af80ff03b7d5..fdbb78f62571 100644 --- a/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch +++ b/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch @@ -1,6 +1,6 @@ diff -ruN valgrind-3.5.0/coregrind/Makefile.am valgrind-3.5.0-fixed/coregrind/Makefile.am --- valgrind-3.5.0/coregrind/Makefile.am 2009-08-19 15:37:47.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/Makefile.am 2009-11-08 01:18:58.000000000 +0100 ++++ valgrind-3.5.0-fixed/coregrind/Makefile.am 2009-11-16 21:38:32.000000000 +0100 @@ -277,22 +277,12 @@ m_demangle/demangle.c \ m_demangle/dyn-string.c \ @@ -41,15 +41,19 @@ diff -ruN valgrind-3.5.0/coregrind/Makefile.am valgrind-3.5.0-fixed/coregrind/Ma m_syswrap/syswrap-main.c \ m_syswrap/syswrap-generic.c \ m_syswrap/syswrap-linux.c \ -@@ -333,6 +313,20 @@ +@@ -333,6 +313,24 @@ m_ume/main.c \ m_ume/script.c +COREGRIND_SOURCES_COMMON += \ + m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \ ++ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S ++ ++if VGCONF_HAVE_PLATFORM_SEC ++COREGRIND_SOURCES_COMMON += \ + m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \ -+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \ + m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S ++endif + +if VGCONF_OS_IS_DARWIN +COREGRIND_SOURCES_COMMON += \ @@ -64,7 +68,7 @@ diff -ruN valgrind-3.5.0/coregrind/Makefile.am valgrind-3.5.0-fixed/coregrind/Ma nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ diff -ruN valgrind-3.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S --- valgrind-3.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-08-19 15:37:41.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-11-08 01:17:30.000000000 +0100 ++++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-11-16 21:38:08.000000000 +0100 @@ -338,11 +338,11 @@ ret .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) @@ -81,7 +85,7 @@ diff -ruN valgrind-3.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3. /*--------------------------------------------------------------------*/ diff -ruN valgrind-3.5.0/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S --- valgrind-3.5.0/coregrind/m_dispatch/dispatch-x86-linux.S 2009-08-19 15:37:41.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S 2009-11-08 01:17:20.000000000 +0100 ++++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S 2009-11-16 21:38:08.000000000 +0100 @@ -305,11 +305,11 @@ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) @@ -98,7 +102,7 @@ diff -ruN valgrind-3.5.0/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.5. /*--------------------------------------------------------------------*/ diff -ruN valgrind-3.5.0/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S --- valgrind-3.5.0/coregrind/m_syswrap/syscall-amd64-linux.S 2009-08-19 15:37:42.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S 2009-11-08 01:16:46.000000000 +0100 ++++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S 2009-11-16 21:38:08.000000000 +0100 @@ -205,11 +205,11 @@ ML_(blksys_finished): .quad 5b .previous @@ -115,7 +119,7 @@ diff -ruN valgrind-3.5.0/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.5. /*--------------------------------------------------------------------*/ diff -ruN valgrind-3.5.0/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S --- valgrind-3.5.0/coregrind/m_syswrap/syscall-x86-linux.S 2009-08-19 15:37:42.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S 2009-11-08 01:16:55.000000000 +0100 ++++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S 2009-11-16 21:38:08.000000000 +0100 @@ -165,11 +165,11 @@ ML_(blksys_finished): .long 5b .previous |