diff --git a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/Manifest index 7d8261dd7c..89e1cdd856 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/Manifest @@ -1,2 +1 @@ -DIST valgrind-3.6.1.tar.bz2 5974836 RMD160 6f78ae50e2fb354547d90bf289abb1f56252043a SHA1 6116ddca2708f56e0a2851bdfbe88e01906fa300 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e -DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6 +DIST valgrind-3.8.1.tar.bz2 7962963 SHA256 473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db SHA512 ba31f5d43bd2d9533846bed6456a0eae40ac071ff8732201dd75c9e2cd7e9ce3224cb5928b9c8fc859a75ce6867a9b6a1fb2ba8ab62cd3944893d6d4156ab25c WHIRLPOOL 81e63bb649455ed29fcd60fc7f3cebde456a610118b9b24530d3b2e8aa4a7561369e992af86ffb158e1f7fc0db7b91738564402931a947a79bb789bd26a8e065 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch deleted file mode 100644 index b0b57bf3a0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Gregorio Guidi - -Retain the old behavior of the build system even with automake 1.11.2. - -Reported-by: Oleg Bulatov -X-Gentoo-Bug: 397429 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429 -X-KDE-Bug: 290719 -X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719 -Signed-off-by: Anthony G. Basile - -diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am ---- valgrind-3.7.0.orig/coregrind/Makefile.am 2011-10-27 12:55:06.000000000 +0200 -+++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-06 17:23:48.717115986 +0100 -@@ -495,7 +495,8 @@ - m_gdbserver/powerpc-altivec64l.xml - - # so as to make sure these get copied into the install tree --pkglib_DATA = $(GDBSERVER_XML_FILES) -+vgdatadir = $(pkglibdir) -+vgdata_DATA = $(GDBSERVER_XML_FILES) - - # so as to make sure these get copied into the tarball - EXTRA_DIST += $(GDBSERVER_XML_FILES) -diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am ---- valgrind-3.7.0.orig/Makefile.am 2011-10-26 23:24:45.000000000 +0200 -+++ valgrind-3.7.0/Makefile.am 2012-01-06 17:23:17.445114847 +0100 -@@ -61,7 +61,8 @@ - # default.supp, as it is built from the base .supp files at compile-time. - dist_noinst_DATA = $(SUPP_FILES) - --pkglib_DATA = default.supp -+vgdatadir = $(pkglibdir) -+vgdata_DATA = default.supp - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = valgrind.pc diff --git a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch deleted file mode 100644 index feabf06935..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 12273) -+++ configure.in (revision 12274) -@@ -98,18 +98,21 @@ - # We don't want gcc < 3.0 - AC_MSG_CHECKING([for a supported version of gcc]) - --# Try to get the gcc version, sed-ing out some unexpected stuff --# that appears with the default gcc on OSX 10.6 and 10.7 respectively. --# Without this, the version number comes out as 686, 10 or 11 :-( -+# Obtain the compiler version. - # --# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) --# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) -+# A few examples of how the ${CC} --version output looks like: - # -+# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2 -+# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2 -+# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585] -+# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2 -+# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) -+# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) -+# Clang: clang version 2.9 (tags/RELEASE_29/final) -+# - [gcc_version=`${CC} --version \ -- | head -n 1 \ -- | $SED 's/i686-apple-darwin10//' \ -- | $SED 's/i686-apple-darwin11//' \ -- | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`] -+ | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \ -+ -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`] - - is_clang="notclang" - if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then diff --git a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch deleted file mode 100644 index f5098a43cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-glibc-2.15.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in ---- valgrind-3.7.0.orig//configure.in 2012-01-14 17:49:13.000000000 -0500 -+++ valgrind-3.7.0/configure.in 2012-01-14 18:13:45.000000000 -0500 -@@ -778,6 +778,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ AC_MSG_RESULT(2.15 family) -+ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -@@ -791,7 +798,7 @@ - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15]) - AC_MSG_ERROR([or Darwin libc]) - ;; - esac diff --git a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch similarity index 62% rename from sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch rename to sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch index 90c0bf1111..66c97764d3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack-v2.patch +++ b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/files/valgrind-3.8.0-non-exec-stack.patch @@ -1,7 +1,7 @@ -diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am ---- valgrind-3.7.0.orig//coregrind/Makefile.am 2011-11-10 20:02:47.000000000 -0500 -+++ valgrind-3.7.0/coregrind/Makefile.am 2011-11-10 20:03:00.000000000 -0500 -@@ -292,14 +292,6 @@ +diff -Naur valgrind-3.8.0.orig//coregrind/Makefile.am valgrind-3.8.0/coregrind/Makefile.am +--- valgrind-3.8.0.orig//coregrind/Makefile.am 2012-08-05 03:47:20.000000000 -0400 ++++ valgrind-3.8.0/coregrind/Makefile.am 2012-08-18 04:14:35.000000000 -0400 +@@ -297,15 +297,6 @@ m_demangle/demangle.c \ m_demangle/dyn-string.c \ m_demangle/safe-ctype.c \ @@ -11,12 +11,13 @@ diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/M - m_dispatch/dispatch-ppc64-linux.S \ - m_dispatch/dispatch-arm-linux.S \ - m_dispatch/dispatch-s390x-linux.S \ +- m_dispatch/dispatch-mips32-linux.S \ - m_dispatch/dispatch-x86-darwin.S \ - m_dispatch/dispatch-amd64-darwin.S \ - m_gdbserver/m_gdbserver.c \ m_gdbserver/inferiors.c \ m_gdbserver/m_gdbserver.c \ -@@ -322,8 +314,6 @@ + m_gdbserver/regcache.c \ +@@ -327,8 +318,6 @@ m_initimg/initimg-pathscan.c \ m_mach/mach_basics.c \ m_mach/mach_msg.c \ @@ -25,8 +26,8 @@ diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/M m_replacemalloc/replacemalloc_core.c \ m_scheduler/scheduler.c \ m_scheduler/sema.c \ -@@ -335,14 +325,6 @@ - m_sigframe/sigframe-s390x-linux.c \ +@@ -343,15 +332,6 @@ + m_sigframe/sigframe-mips32-linux.c \ m_sigframe/sigframe-x86-darwin.c \ m_sigframe/sigframe-amd64-darwin.c \ - m_syswrap/syscall-x86-linux.S \ @@ -35,12 +36,13 @@ diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/M - m_syswrap/syscall-ppc64-linux.S \ - m_syswrap/syscall-arm-linux.S \ - m_syswrap/syscall-s390x-linux.S \ +- m_syswrap/syscall-mips32-linux.S \ - m_syswrap/syscall-x86-darwin.S \ - m_syswrap/syscall-amd64-darwin.S \ m_syswrap/syswrap-main.c \ m_syswrap/syswrap-generic.c \ m_syswrap/syswrap-linux.c \ -@@ -361,6 +343,29 @@ +@@ -371,6 +351,29 @@ m_ume/main.c \ m_ume/script.c @@ -70,12 +72,12 @@ diff -Naur valgrind-3.7.0.orig//coregrind/Makefile.am valgrind-3.7.0/coregrind/M libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ $(COREGRIND_SOURCES_COMMON) nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ -diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S ---- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S 2011-10-26 17:24:42.000000000 -0400 -+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2011-11-10 20:07:40.000000000 -0500 -@@ -349,11 +349,11 @@ - ret - .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) +diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S +--- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S 2012-08-05 12:04:11.000000000 -0400 ++++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2012-08-18 04:15:57.000000000 -0400 +@@ -249,11 +249,11 @@ + + .size VG_(disp_run_translations), .-VG_(disp_run_translations) +#endif // defined(VGP_amd64_linux) + @@ -87,14 +89,13 @@ diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-amd64-linux.S valg /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ -diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S ---- valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S 2011-10-26 17:24:42.000000000 -0400 -+++ valgrind-3.7.0/coregrind/m_dispatch/dispatch-x86-linux.S 2011-11-10 20:04:07.000000000 -0500 -@@ -320,12 +320,11 @@ - ret - .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation) +diff -Naur valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S +--- valgrind-3.8.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S 2012-08-05 12:04:11.000000000 -0400 ++++ valgrind-3.8.0/coregrind/m_dispatch/dispatch-x86-linux.S 2012-08-18 04:16:44.000000000 -0400 +@@ -240,11 +240,11 @@ + + .size VG_(disp_run_translations), .-VG_(disp_run_translations) -- +#endif // defined(VGP_x86_linux) + /* Let the linker know we don't need an executable stack */ @@ -105,9 +106,9 @@ diff -Naur valgrind-3.7.0.orig//coregrind/m_dispatch/dispatch-x86-linux.S valgri /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ -diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S ---- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 20:02:47.000000000 -0500 -+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 20:03:00.000000000 -0500 +diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S +--- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S 2012-08-05 12:04:11.000000000 -0400 ++++ valgrind-3.8.0/coregrind/m_syswrap/syscall-amd64-linux.S 2012-08-18 04:17:21.000000000 -0400 @@ -205,11 +205,11 @@ ML_(blksys_finished): .quad 5b .previous @@ -122,22 +123,20 @@ diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-amd64-linux.S valgri /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ -diff -Naur valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S ---- valgrind-3.7.0.orig//coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 20:02:47.000000000 -0500 -+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 20:03:00.000000000 -0500 -@@ -164,12 +164,12 @@ - ML_(blksys_committed): .long 4b +diff -Naur valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S +--- valgrind-3.8.0.orig//coregrind/m_syswrap/syscall-x86-linux.S 2012-08-05 12:04:11.000000000 -0400 ++++ valgrind-3.8.0/coregrind/m_syswrap/syscall-x86-linux.S 2012-08-18 04:17:59.000000000 -0400 +@@ -165,11 +165,11 @@ ML_(blksys_finished): .long 5b .previous -- --/* Let the linker know we don't need an executable stack */ --.section .note.GNU-stack,"",@progbits - - #endif // defined(VGP_x86_linux) - -+/* Let the linker know we don't need an executable stack */ -+.section .note.GNU-stack,"",@progbits + ++#endif // defined(VGP_x86_linux) + + /* Let the linker know we don't need an executable stack */ + .section .note.GNU-stack,"",@progbits + +-#endif // defined(VGP_x86_linux) +- /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ diff --git a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/valgrind-3.7.0-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/valgrind-3.8.1.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/dev-util/valgrind/valgrind-3.7.0-r4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/valgrind/valgrind-3.8.1.ebuild index eb6319bdda..579a043570 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/valgrind/valgrind-3.7.0-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/valgrind/valgrind-3.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v 1.2 2012/05/10 09:21:33 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.8.1.ebuild,v 1.1 2012/09/20 20:49:50 blueness Exp $ EAPI="4" inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils @@ -35,16 +35,7 @@ src_prepare() { # Don't build in empty assembly files for other platforms or we'll get a QA # warning about executable stacks. - epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack-v2.patch - - # Fix the regex to get gcc's version - epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch - - # Fix stricter use of dir variables, bug #397429 - epatch "${FILESDIR}"/${PN}-3.7.0-automake-1.11.2.patch - - # Fix for glibc 2.15, bug #398921 - epatch "${FILESDIR}"/${PN}-3.7.0-glibc-2.15.patch + epatch "${FILESDIR}"/${PN}-3.8.0-non-exec-stack.patch # Regenerate autotools files eautoreconf