Fix compilation of valgrind-3.5.0 on systems without a secondary arch (bug #293169).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 23 insertions, 13 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/Manifest b/dev-util/valgrind/Manifest
index e68a3942b8a8..b0e29d612008 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -11,7 +11,7 @@ AUX valgrind-3.4.1-respect-LDFLAGS.patch 826 RMD160 402571c928998990ac396416b9df
 AUX valgrind-3.4.1-x86_64-ldso-strlen.patch 2767 RMD160 0b6047712706f0cda86e80a4174415591bd035fe SHA1 a08cd4d62d0950188c734f6884cc460032b07a2a SHA256 43d667bc2db7c7d7ee96a0108166a1cfa06ecabde86313a5fb96c47ad26062cc
 AUX valgrind-3.5.0-glibc-2.11.patch 1432 RMD160 5a6b69680fd6d5f0d125cb7440cdd1c4e1e1b691 SHA1 3c274e8d3ca8d5fea478d672b4da8df1bc33ae6f SHA256 ce98a761accf720a0acb09b7634206f512bd465b41f94f73c9d1aa2136b64802
 AUX valgrind-3.5.0-local-labels.patch 1410 RMD160 d026881b5d38b0a009825801ce996e532a3805e1 SHA1 24251a9f16dc79cf16b8a8e3bf57c4ab10a66600 SHA256 b2ba93ae4b29995606a14ad8a6c0091aa277c3a11406aec3558db3a1348ca1c0
-AUX valgrind-3.5.0-non-exec-stack.patch 5501 RMD160 d87b56077f349da80c054ea6f76c5fabe0ac9b6e SHA1 be0c055a18b7af950f535ec8877786f6a4e69254 SHA256 fc41cb5f0e9d1249049cabed597ee859b72bdc4d16ed607bac6902e0d3c76b38
+AUX valgrind-3.5.0-non-exec-stack.patch 5568 RMD160 540b2bac578b8ee4ef2c9af90865f5034a9baac6 SHA1 ef6ab49b1d803ca0713feb99ec53d30af0cc3160 SHA256 9becbb1e78fd0799124820208f069ecc1de9dc7eb5ee15a76b94869ca8250d2d
 AUX valgrind-3.5.0-respect-LDFLAGS.patch 368 RMD160 e4d633cabe33af12bf9a2a434ee3a76a379423a3 SHA1 31086a72e6cea2f0144ba449c60fc98c454ebd93 SHA256 2d1cff754119681e1923e7a3f06b58535c9e44a0046ced2d67dd0d354c3e606a
 DIST valgrind-3.3.1.tar.bz2 4544805 RMD160 32fb26de2ffd0d62e66a1f29cfa6785b7ffa8c36 SHA1 3a64ee5f6439815fa6c5200dcfd0399f9dc83348 SHA256 95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
 DIST valgrind-3.4.0.tar.bz2 5175209 RMD160 3db249843f0845ca0892e557bede7d21d3112e3f SHA1 ae68418a4c283d14ae6454aca4a720ac936422df SHA256 d5ea4ae5b1ef9fca677a38959060a9acb70b38540721c8bf5c73d09a265f9f74
@@ -23,12 +23,12 @@ EBUILD valgrind-3.4.0.ebuild 3255 RMD160 feb78ead8a3f3ed9bf69dda9f533875779b6d18
 EBUILD valgrind-3.4.1-r1.ebuild 3976 RMD160 6347e2eb6e3d236078ea052d0669b095b22768bf SHA1 d81b09987ceef975c4d095340e37dcdb2740bfef SHA256 92e54faafb566d0260d28b8e5ac0853094343dde0b3df9781600fd8191fa4075
 EBUILD valgrind-3.4.1.ebuild 3046 RMD160 655d9e0fbecaf08e720d74f5f684c85871cd0174 SHA1 86a4a553cc16007e0ee309e2a59d753d8acf9f35 SHA256 21d4972c1cf48e3a12bc6a4ad65a72d5576bc45ef4166c8a16186b410ba93a6e
 EBUILD valgrind-3.5.0.ebuild 3482 RMD160 64a3c313a3686f0e79db8683d21071f7a1509803 SHA1 b6858a09c3030ca7736949778846fede934dc04c SHA256 0901357dc7e66800d561de67cc2d6c4a582ab71ccc1555d0abd0600dc25e47ef
-MISC ChangeLog 18071 RMD160 9929366a988f627585c06c363bbe8628b99e79ea SHA1 8e22b1a5f8aa82131fc0c2ba43e14a741f8a64b8 SHA256 03fd9485ff2ed7de6e2bbd756353a9224afb919922f9d610fc6d3534718b9188
+MISC ChangeLog 18387 RMD160 e20de9c131710a0c468b326a78cbf60ca650194f SHA1 5cc67081b6b143d61e1fe65de8c94b74d6261445 SHA256 1ea4622f531f92ea31d15ec0f020d565c16774b0a0e3ad074af5ac4bb0950ced
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkr2EMYACgkQMGnpIbeahxx9wwCgpY34OLlx/BU4vvgvY+Ib8fER
-dhIAn0uzQYNUyQUr3m9gyNTVEUVmC6Qr
-=/194
+iEUEARECAAYFAksButYACgkQMGnpIbeahxxsvgCgpVVoA9vnUlmcfkltu8kj6UKl
+AVEAlRIpuEf9augcoV5xVsFPdFPt1rI=
+=y15k
 -----END PGP SIGNATURE-----
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