* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-02-17 20:42 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-02-17 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 7945a88ec53100112791d79fd91a6a709dbb612f
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 20:42:38 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 20:42:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=7945a88e
dev-util/valgrind: bump 3.6.1 and added patch for --enable-qtcore to configure.in
(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/valgrind/ChangeLog | 43 +++---
dev-util/valgrind/Manifest | 10 +-
.../files/valgrind-3.4.1-glibc-2.10.1.patch | 49 +++++++
.../files/valgrind-3.6.0-local-labels.patch | 24 ++++
.../files/valgrind-3.6.0-non-exec-stack.patch | 137 ++++++++++++++++++++
.../files/valgrind-3.6.1-user-enable-qt4.patch | 89 +++++++++++++
dev-util/valgrind/metadata.xml | 2 +-
dev-util/valgrind/valgrind-3.6.1.ebuild | 97 ++++++++++++++
8 files changed, 426 insertions(+), 25 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 0b9ad44..d47b14f 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,35 +1,34 @@
# ChangeLog for dev-util/valgrind
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.116 2010/08/31 14:23:21 dberkholz Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.119 2011/01/27 04:51:32 ssuominen Exp $
- 10 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
- -files/valgrind-3.4.1-glibc-2.10.1.patch, -valgrind-3.6.0.ebuild,
- -files/valgrind-3.6.0-local-labels.patch,
- -files/valgrind-3.6.0-non-exec-stack.patch:
- In the tree
+*valgrind-3.6.1 (17 Feb 2011)
+
+ 17 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+ +files/valgrind-3.4.1-glibc-2.10.1.patch,
+ +files/valgrind-3.6.0-local-labels.patch,
+ +files/valgrind-3.6.0-non-exec-stack.patch, +valgrind-3.6.1.ebuild,
+ +files/valgrind-3.6.1-user-enable-qt4.patch, metadata.xml:
+ Bump 3.6.1 and added patch for --enable-qtcore to configure.in
-*valgrind-3.6.0 (02 Nov 2010)
+ 27 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> valgrind-3.6.0.ebuild,
+ +files/valgrind-3.6.0-glibc-2.13.patch,
+ +files/valgrind-3.6.0-strcasecmp.patch:
+ Fix compability with recent glibc release.
- 02 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+*valgrind-3.6.0 (10 Nov 2010)
+
+ 10 Nov 2010; Anthony G. Basile <blueness@gentoo.org>
+valgrind-3.6.0.ebuild, +files/valgrind-3.6.0-local-labels.patch,
+files/valgrind-3.6.0-non-exec-stack.patch:
- Version bump
-
- 28 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
- -valgrind-3.5.0-r1.ebuild:
- In the tree.
+ Version bump, bug #342189
*valgrind-3.5.0-r1 (28 Oct 2010)
28 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
- +files/valgrind-3.4.1-glibc-2.10.1.patch, +valgrind-3.5.0-r1.ebuild,
- +files/valgrind-3.5.0-glibc-2.11.patch,
- +files/valgrind-3.5.0-glibc-2.12.patch,
- +files/valgrind-3.5.0-local-labels.patch,
- +files/valgrind-3.5.0-non-exec-stack.patch,
- +files/valgrind-3.5.0-respect-LDFLAGS.patch,
- +files/valgrind-3.5.0-stat_h.patch, +metadata.xml:
- Pax markings for bug #341599
+ +valgrind-3.5.0-r1.ebuild, metadata.xml:
+ Added pax markings to fix bug #341599
+ Added myself as maintainer
31 Aug 2010; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
griffon26 is retiring, reassign to maintainer-needed.
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 23b2bdf..b9f05e4 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,2 +1,8 @@
-MISC ChangeLog 20231 RMD160 38aff6706169108d13a2f42d4e7bf1a6e922cb9a SHA1 8c03c911f091e7cb76ceeb457d05f2c730809a79 SHA256 e8355f7ceafba06e267fd8f8e3e3fedcbc1652432fc0861156693b709d597bc2
-MISC metadata.xml 1011 RMD160 9318120438d39d4b2ae45d69a850681e4bb0879d SHA1 94f1fa1822a8ab5749f82904914b0892ce5316a7 SHA256 14bf2eff2f7aa1908a3908a975842b18aa35d49a4288eb374ce5c8f642c735a3
+AUX valgrind-3.4.1-glibc-2.10.1.patch 1305 RMD160 27586a6140bc0c96589f7077a3c9ee266010ac9c SHA1 dc5df31911c93c98d7876fc6ad9157ab62b38de2 SHA256 b250a3f7e8654cbc835570b0647d035f25a866a51312a8c0d82119db474eddd6
+AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
+AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
+AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
+DIST valgrind-3.6.1.tar.bz2 5974836 RMD160 6f78ae50e2fb354547d90bf289abb1f56252043a SHA1 6116ddca2708f56e0a2851bdfbe88e01906fa300 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
+EBUILD valgrind-3.6.1.ebuild 3075 RMD160 359749476713239357a2a4d317916a97b8c78d84 SHA1 50a69383d04040b5837ac08e1dc19d7ddccb37a3 SHA256 e7c71b807172d4d42bb9793d6d6a9edc6c784d582ea85998706f589a2145e900
+MISC ChangeLog 20230 RMD160 b67cb5b2086d6b33e0b9d52abb430f5dabf5fb87 SHA1 3692f72c6fa1f64dd25086e3064793cb8802645c SHA256 7391c36c738b3d5f5abee2df045f41bdadaba103c9fc73b94c8b644f3a1fc2d7
+MISC metadata.xml 1002 RMD160 cac070ef7b7c44166aa21cda6063c597f66d0303 SHA1 adb9b3de0413a58f79b522f06f542854c3aaaca0 SHA256 ad67a48bab8386d59f5481471eb6a474e68a08a7f1d8f8c7a41b1134ac464f68
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
new file mode 100644
index 0000000..393dc7c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
@@ -0,0 +1,49 @@
+--- valgrind-3.4.1/glibc-2.X.supp.in.jj 2009-03-01 17:04:51.000000000 -0500
++++ valgrind-3.4.1/glibc-2.X.supp.in 2009-05-11 11:17:35.605396000 -0400
+@@ -168,9 +168,9 @@
+ Memcheck:Param
+ socketcall.sendto(msg)
+ fun:__sendto_nocancel
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+ glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+ fun:__nscd_get_map_ref
+ fun:nscd_get*_r
+ fun:*nscd*
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+
+
+@@ -199,18 +199,18 @@
+ Memcheck:Param
+ socketcall.sendto(msg)
+ fun:send
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+ X11-64bit-padding-4b
+ Memcheck:Param
+ socketcall.send(msg)
+ fun:send
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+
+ ##----------------------------------------------------------------------##
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
new file mode 100644
index 0000000..68e6822
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
@@ -0,0 +1,24 @@
+--- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
++++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
+@@ -81,8 +81,8 @@
+ { UInt cia, r1, lr; \
+ __asm__ __volatile__( \
+ "mflr 0;" /* r0 = lr */ \
+- "bl m_libcassert_get_ip;" /* lr = pc */ \
+- "m_libcassert_get_ip:\n" \
++ "bl 0f;" /* lr = pc */ \
++ "0:\n" \
+ "mflr %0;" /* %0 = pc */ \
+ "mtlr 0;" /* restore lr */ \
+ "mr %1,1;" /* %1 = r1 */ \
+@@ -100,8 +100,8 @@
+ { ULong cia, r1, lr; \
+ __asm__ __volatile__( \
+ "mflr 0;" /* r0 = lr */ \
+- "bl .m_libcassert_get_ip;" /* lr = pc */ \
+- ".m_libcassert_get_ip:\n" \
++ "bl 0f;" /* lr = pc */ \
++ "0:\n" \
+ "mflr %0;" /* %0 = pc */ \
+ "mtlr 0;" /* restore lr */ \
+ "mr %1,1;" /* %1 = r1 */ \
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
new file mode 100644
index 0000000..dc99694
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
@@ -0,0 +1,137 @@
+diff -ruN valgrind-3.6.0.orig/coregrind/Makefile.am valgrind-3.6.0/coregrind/Makefile.am
+--- valgrind-3.6.0.orig/coregrind/Makefile.am 2010-10-21 04:19:45.000000000 +0800
++++ valgrind-3.6.0/coregrind/Makefile.am 2010-10-24 20:39:42.655001876 +0800
+@@ -285,23 +285,12 @@
+ m_demangle/demangle.c \
+ m_demangle/dyn-string.c \
+ m_demangle/safe-ctype.c \
+- m_dispatch/dispatch-x86-linux.S \
+- m_dispatch/dispatch-amd64-linux.S \
+- m_dispatch/dispatch-ppc32-linux.S \
+- m_dispatch/dispatch-ppc64-linux.S \
+- m_dispatch/dispatch-arm-linux.S \
+- m_dispatch/dispatch-ppc32-aix5.S \
+- m_dispatch/dispatch-ppc64-aix5.S \
+- m_dispatch/dispatch-x86-darwin.S \
+- m_dispatch/dispatch-amd64-darwin.S \
+ m_initimg/initimg-linux.c \
+ m_initimg/initimg-aix5.c \
+ m_initimg/initimg-darwin.c \
+ m_initimg/initimg-pathscan.c \
+ m_mach/mach_basics.c \
+ m_mach/mach_msg.c \
+- m_mach/mach_traps-x86-darwin.S \
+- m_mach/mach_traps-amd64-darwin.S \
+ m_replacemalloc/replacemalloc_core.c \
+ m_scheduler/scheduler.c \
+ m_scheduler/sema.c \
+@@ -314,15 +303,6 @@
+ m_sigframe/sigframe-ppc64-aix5.c \
+ m_sigframe/sigframe-x86-darwin.c \
+ m_sigframe/sigframe-amd64-darwin.c \
+- m_syswrap/syscall-x86-linux.S \
+- m_syswrap/syscall-amd64-linux.S \
+- m_syswrap/syscall-ppc32-linux.S \
+- m_syswrap/syscall-ppc64-linux.S \
+- m_syswrap/syscall-arm-linux.S \
+- m_syswrap/syscall-ppc32-aix5.S \
+- m_syswrap/syscall-ppc64-aix5.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 \
+@@ -343,6 +323,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_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++ m_start-@VGCONF_ARCH_PRI@-darwin.S \
++ m_start-@VGCONF_ARCH_SEC@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+ $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-21 04:19:39.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-24 20:39:41.462001899 +0800
+@@ -338,11 +338,11 @@
+ ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end ---*/
+ /*--------------------------------------------------------------------*/
+diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-21 04:19:39.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-24 20:39:41.022001883 +0800
+@@ -304,12 +304,11 @@
+ ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+
++#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 -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-21 04:19:41.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-24 20:39:40.576001879 +0800
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished): .quad 5b
+ .previous
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end ---*/
+ /*--------------------------------------------------------------------*/
+diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-21 04:19:41.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-24 20:39:40.152001876 +0800
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed): .long 4b
+ ML_(blksys_finished): .long 5b
+ .previous
++
++#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/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
new file mode 100644
index 0000000..8f7c394
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
@@ -0,0 +1,89 @@
+--- configure.in.orig 2011-02-17 14:29:14.000000000 -0500
++++ configure.in 2011-02-17 15:05:46.000000000 -0500
+@@ -1692,7 +1692,8 @@
+ # NEEDED BY THE REGRESSION TEST PROGRAMS.
+
+
+-# The test below verifies whether the QtCore package been installed.
++# The test below first checks if the user has manaually disabled
++# QtCore. It then verifies whether the QtCore package been installed.
+ # This test works as follows:
+ # - If pkg-config was not installed at the time autogen.sh was run,
+ # the definition of the PKG_CHECK_EXISTS() macro will not be found by
+@@ -1709,37 +1710,49 @@
+ # the pkg-config executable is not present on the system on which the
+ # configure script is run.
+
+-ifdef(
+- [PKG_CHECK_EXISTS],
+- [PKG_CHECK_EXISTS(
+- [QtCore],
++AC_ARG_ENABLE(qtcore,
++ AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
+ [
+- PKG_CHECK_MODULES([QTCORE], [QtCore])
+- # Paranoia: don't trust the result reported by pkg-config, but when
+- # pkg-config reports that QtCore has been found, verify whether linking
+- # programs with QtCore succeeds.
+- AC_LANG(C++)
+- safe_CXXFLAGS="${CXXFLAGS}"
+- CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
+- AC_TRY_LINK(
+- [#include <QMutex>],
+- [QMutex Mutex;],
+- [ac_have_qtcore=yes],
+- [
+- AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
+- ac_have_qtcore=no
+- ]
+- )
+- CXXFLAGS="${safe_CXXFLAGS}"
++ if test x$enableval = xno ; then
++ AC_MSG_CHECKING([for QTCORE ])
++ AC_MSG_RESULT([QTCORE is manually distabled.])
++ [ac_have_qtcore=no]
++ fi
+ ],
+ [
+- ac_have_qtcore=no
++ ifdef(
++ [PKG_CHECK_EXISTS],
++ [PKG_CHECK_EXISTS(
++ [QtCore],
++ [
++ PKG_CHECK_MODULES([QTCORE], [QtCore])
++ # Paranoia: don't trust the result reported by pkg-config, but when
++ # pkg-config reports that QtCore has been found, verify whether linking
++ # programs with QtCore succeeds.
++ AC_LANG(C++)
++ safe_CXXFLAGS="${CXXFLAGS}"
++ CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
++ AC_TRY_LINK(
++ [#include <QMutex>],
++ [QMutex Mutex;],
++ [ac_have_qtcore=yes],
++ [
++ AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
++ ac_have_qtcore=no
++ ]
++ )
++ CXXFLAGS="${safe_CXXFLAGS}"
++ ],
++ [
++ ac_have_qtcore=no
++ ]
++ )
++ ],
++ AC_MSG_WARN([pkg-config has not been installed or is too old.])
++ AC_MSG_WARN([Detection of Qt4 will be skipped.])
++ [ac_have_qtcore=no]
++ )
+ ]
+- )
+- ],
+- AC_MSG_WARN([pkg-config has not been installed or is too old.])
+- AC_MSG_WARN([Detection of Qt4 will be skipped.])
+- [ac_have_qtcore=no]
+ )
+
+ AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index d2d8e48..3f7df2c 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<herd>no-herd</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>blueness@gentoo.org</email>
</maintainer>
<longdescription>
Valgrind is a GPL'd tool to help you find memory-management problems
diff --git a/dev-util/valgrind/valgrind-3.6.1.ebuild b/dev-util/valgrind/valgrind-3.6.1.ebuild
new file mode 100644
index 0000000..a0c131d
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.0.ebuild,v 1.2 2011/01/27 04:51:32 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi qt4"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # Respect CFLAGS, LDFLAGS
+ sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
+ mpi/Makefile.am || die
+
+ # Changing Makefile.all.am to disable SSP
+ sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
+ Makefile.all.am || die
+
+ # Correct hard coded doc location
+ sed -i -e "s:doc/valgrind:doc/${PF}:" \
+ docs/Makefile.am || die
+
+ # Yet more local labels, this time for ppc32 & ppc64
+ epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+ # Don't build in empty assembly files for other platforms or we'll get a QA
+ # warning about executable stacks.
+ epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
+
+ # Fix up some suppressions that were not general enough for glibc versions
+ # with more than just a major and minor number.
+ epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
+
+ # Remove automagic dependency on qt4
+ epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
+
+ # Regenerate autotools files
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression"
+ # while compiling insn_sse.c in none/tests/x86
+ # -fpie valgrind seemingly hangs when built with pie on
+ # amd64 (bug #102157)
+ # -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
+ replace-flags -ggdb3 -ggdb2
+
+ if use amd64 || use ppc64; then
+ ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+ fi
+
+ # Don't use mpicc unless the user asked for it (bug #258832)
+ if ! use mpi; then
+ myconf="${myconf} --without-mpicc"
+ fi
+
+ if ! use qt4; then
+ myconf="${myconf} --disable-qtcore"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS FAQ.txt NEWS README*
+
+ pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+ if use ppc || use ppc64 || use amd64 ; then
+ ewarn "Valgrind will not work on ppc, ppc64 or amd64 if glibc does not have"
+ ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065"
+ ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=274771)."
+ ewarn "To fix this you can add splitdebug to FEATURES in make.conf and"
+ ewarn "remerge glibc."
+ fi
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-02-21 18:17 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-02-21 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 321d6c06a23d34ab2f5e0820e917d9fe4b794d93
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 18:17:41 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 18:17:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=321d6c06
dev-util/valgrind: moved to tree
(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)
---
dev-util/valgrind/ChangeLog | 4 +
dev-util/valgrind/Manifest | 5 +-
.../files/valgrind-3.6.1-user-enable-qt4.patch | 89 ------------------
dev-util/valgrind/valgrind-3.6.1.ebuild | 97 --------------------
4 files changed, 5 insertions(+), 190 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index d47b14f..f2899f9 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.119 2011/01/27 04:51:32 ssuominen Exp $
+ 21 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
+ -valgrind-3.6.1.ebuild, -files/valgrind-3.6.1-user-enable-qt4.patch:
+ moved to tree
+
*valgrind-3.6.1 (17 Feb 2011)
17 Feb 2011; Anthony G. Basile <blueness@gentoo.org>
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index b9f05e4..3614486 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,8 +1,5 @@
AUX valgrind-3.4.1-glibc-2.10.1.patch 1305 RMD160 27586a6140bc0c96589f7077a3c9ee266010ac9c SHA1 dc5df31911c93c98d7876fc6ad9157ab62b38de2 SHA256 b250a3f7e8654cbc835570b0647d035f25a866a51312a8c0d82119db474eddd6
AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
-AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
-DIST valgrind-3.6.1.tar.bz2 5974836 RMD160 6f78ae50e2fb354547d90bf289abb1f56252043a SHA1 6116ddca2708f56e0a2851bdfbe88e01906fa300 SHA256 49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e
-EBUILD valgrind-3.6.1.ebuild 3075 RMD160 359749476713239357a2a4d317916a97b8c78d84 SHA1 50a69383d04040b5837ac08e1dc19d7ddccb37a3 SHA256 e7c71b807172d4d42bb9793d6d6a9edc6c784d582ea85998706f589a2145e900
-MISC ChangeLog 20230 RMD160 b67cb5b2086d6b33e0b9d52abb430f5dabf5fb87 SHA1 3692f72c6fa1f64dd25086e3064793cb8802645c SHA256 7391c36c738b3d5f5abee2df045f41bdadaba103c9fc73b94c8b644f3a1fc2d7
+MISC ChangeLog 20373 RMD160 715c5dd01c7369e0744b87e3897601a259fefe62 SHA1 9b060b5d9278e56769cbe46908f5607f9db9b855 SHA256 2dfc74af88d203e2388b25fddfdf8ee2d5f3eb67e501161b0863ac91c88a8afc
MISC metadata.xml 1002 RMD160 cac070ef7b7c44166aa21cda6063c597f66d0303 SHA1 adb9b3de0413a58f79b522f06f542854c3aaaca0 SHA256 ad67a48bab8386d59f5481471eb6a474e68a08a7f1d8f8c7a41b1134ac464f68
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
deleted file mode 100644
index 8f7c394..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.in.orig 2011-02-17 14:29:14.000000000 -0500
-+++ configure.in 2011-02-17 15:05:46.000000000 -0500
-@@ -1692,7 +1692,8 @@
- # NEEDED BY THE REGRESSION TEST PROGRAMS.
-
-
--# The test below verifies whether the QtCore package been installed.
-+# The test below first checks if the user has manaually disabled
-+# QtCore. It then verifies whether the QtCore package been installed.
- # This test works as follows:
- # - If pkg-config was not installed at the time autogen.sh was run,
- # the definition of the PKG_CHECK_EXISTS() macro will not be found by
-@@ -1709,37 +1710,49 @@
- # the pkg-config executable is not present on the system on which the
- # configure script is run.
-
--ifdef(
-- [PKG_CHECK_EXISTS],
-- [PKG_CHECK_EXISTS(
-- [QtCore],
-+AC_ARG_ENABLE(qtcore,
-+ AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
- [
-- PKG_CHECK_MODULES([QTCORE], [QtCore])
-- # Paranoia: don't trust the result reported by pkg-config, but when
-- # pkg-config reports that QtCore has been found, verify whether linking
-- # programs with QtCore succeeds.
-- AC_LANG(C++)
-- safe_CXXFLAGS="${CXXFLAGS}"
-- CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
-- AC_TRY_LINK(
-- [#include <QMutex>],
-- [QMutex Mutex;],
-- [ac_have_qtcore=yes],
-- [
-- AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
-- ac_have_qtcore=no
-- ]
-- )
-- CXXFLAGS="${safe_CXXFLAGS}"
-+ if test x$enableval = xno ; then
-+ AC_MSG_CHECKING([for QTCORE ])
-+ AC_MSG_RESULT([QTCORE is manually distabled.])
-+ [ac_have_qtcore=no]
-+ fi
- ],
- [
-- ac_have_qtcore=no
-+ ifdef(
-+ [PKG_CHECK_EXISTS],
-+ [PKG_CHECK_EXISTS(
-+ [QtCore],
-+ [
-+ PKG_CHECK_MODULES([QTCORE], [QtCore])
-+ # Paranoia: don't trust the result reported by pkg-config, but when
-+ # pkg-config reports that QtCore has been found, verify whether linking
-+ # programs with QtCore succeeds.
-+ AC_LANG(C++)
-+ safe_CXXFLAGS="${CXXFLAGS}"
-+ CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
-+ AC_TRY_LINK(
-+ [#include <QMutex>],
-+ [QMutex Mutex;],
-+ [ac_have_qtcore=yes],
-+ [
-+ AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
-+ ac_have_qtcore=no
-+ ]
-+ )
-+ CXXFLAGS="${safe_CXXFLAGS}"
-+ ],
-+ [
-+ ac_have_qtcore=no
-+ ]
-+ )
-+ ],
-+ AC_MSG_WARN([pkg-config has not been installed or is too old.])
-+ AC_MSG_WARN([Detection of Qt4 will be skipped.])
-+ [ac_have_qtcore=no]
-+ )
- ]
-- )
-- ],
-- AC_MSG_WARN([pkg-config has not been installed or is too old.])
-- AC_MSG_WARN([Detection of Qt4 will be skipped.])
-- [ac_have_qtcore=no]
- )
-
- AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
diff --git a/dev-util/valgrind/valgrind-3.6.1.ebuild b/dev-util/valgrind/valgrind-3.6.1.ebuild
deleted file mode 100644
index a0c131d..0000000
--- a/dev-util/valgrind/valgrind-3.6.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.0.ebuild,v 1.2 2011/01/27 04:51:32 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi qt4"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Respect CFLAGS, LDFLAGS
- sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
- mpi/Makefile.am || die
-
- # Changing Makefile.all.am to disable SSP
- sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
- Makefile.all.am || die
-
- # Correct hard coded doc location
- sed -i -e "s:doc/valgrind:doc/${PF}:" \
- docs/Makefile.am || die
-
- # Yet more local labels, this time for ppc32 & ppc64
- epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
-
- # Don't build in empty assembly files for other platforms or we'll get a QA
- # warning about executable stacks.
- epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
-
- # Fix up some suppressions that were not general enough for glibc versions
- # with more than just a major and minor number.
- epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
-
- # Remove automagic dependency on qt4
- epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
-
- # Regenerate autotools files
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression"
- # while compiling insn_sse.c in none/tests/x86
- # -fpie valgrind seemingly hangs when built with pie on
- # amd64 (bug #102157)
- # -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
- replace-flags -ggdb3 -ggdb2
-
- if use amd64 || use ppc64; then
- ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
- fi
-
- # Don't use mpicc unless the user asked for it (bug #258832)
- if ! use mpi; then
- myconf="${myconf} --without-mpicc"
- fi
-
- if ! use qt4; then
- myconf="${myconf} --disable-qtcore"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS FAQ.txt NEWS README*
-
- pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
-}
-
-pkg_postinst() {
- if use ppc || use ppc64 || use amd64 ; then
- ewarn "Valgrind will not work on ppc, ppc64 or amd64 if glibc does not have"
- ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065"
- ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=274771)."
- ewarn "To fix this you can add splitdebug to FEATURES in make.conf and"
- ewarn "remerge glibc."
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-11-10 20:56 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-11-10 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 08088f39dd503fab7c45da063af4242ff8f1e312
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 20:56:35 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 20:56:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=08088f39
dev-util/valgrind: initial test of 3.7.0
---
dev-util/valgrind/ChangeLog | 2 +
dev-util/valgrind/Manifest | 10 ++
.../files/valgrind-3.4.1-glibc-2.10.1.patch | 49 +++++++
.../files/valgrind-3.6.0-local-labels.patch | 24 ++++
.../files/valgrind-3.6.0-non-exec-stack.patch | 137 ++++++++++++++++++++
.../valgrind/files/valgrind-3.6.1-glibc-2.14.patch | 26 ++++
.../valgrind/files/valgrind-3.6.1-linux-3.patch | 11 ++
.../files/valgrind-3.6.1-user-enable-qt4.patch | 89 +++++++++++++
dev-util/valgrind/metadata.xml | 23 ++++
dev-util/valgrind/valgrind-3.7.0.ebuild | 102 +++++++++++++++
10 files changed, 473 insertions(+), 0 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/dev-util/valgrind/ChangeLog
@@ -0,0 +1,2 @@
+
+
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
new file mode 100644
index 0000000..e6daef9
--- /dev/null
+++ b/dev-util/valgrind/Manifest
@@ -0,0 +1,10 @@
+AUX valgrind-3.4.1-glibc-2.10.1.patch 1305 RMD160 27586a6140bc0c96589f7077a3c9ee266010ac9c SHA1 dc5df31911c93c98d7876fc6ad9157ab62b38de2 SHA256 b250a3f7e8654cbc835570b0647d035f25a866a51312a8c0d82119db474eddd6
+AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
+AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
+AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5
+AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582
+AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
+DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
+EBUILD valgrind-3.7.0.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858
+MISC ChangeLog 2 RMD160 e5043315c7d228fbf17daf82b8e725f54b1ac2f6 SHA1 71853c6197a6a7f222db0f1978c7cb232b87c5ee SHA256 75a11da44c802486bc6f65640aa48a730f0f684c5c07a42ba3cd1735eb3fb070
+MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
new file mode 100644
index 0000000..393dc7c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
@@ -0,0 +1,49 @@
+--- valgrind-3.4.1/glibc-2.X.supp.in.jj 2009-03-01 17:04:51.000000000 -0500
++++ valgrind-3.4.1/glibc-2.X.supp.in 2009-05-11 11:17:35.605396000 -0400
+@@ -168,9 +168,9 @@
+ Memcheck:Param
+ socketcall.sendto(msg)
+ fun:__sendto_nocancel
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+ glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+ fun:__nscd_get_map_ref
+ fun:nscd_get*_r
+ fun:*nscd*
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+
+
+@@ -199,18 +199,18 @@
+ Memcheck:Param
+ socketcall.sendto(msg)
+ fun:send
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+ X11-64bit-padding-4b
+ Memcheck:Param
+ socketcall.send(msg)
+ fun:send
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+
+ ##----------------------------------------------------------------------##
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
new file mode 100644
index 0000000..68e6822
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
@@ -0,0 +1,24 @@
+--- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
++++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
+@@ -81,8 +81,8 @@
+ { UInt cia, r1, lr; \
+ __asm__ __volatile__( \
+ "mflr 0;" /* r0 = lr */ \
+- "bl m_libcassert_get_ip;" /* lr = pc */ \
+- "m_libcassert_get_ip:\n" \
++ "bl 0f;" /* lr = pc */ \
++ "0:\n" \
+ "mflr %0;" /* %0 = pc */ \
+ "mtlr 0;" /* restore lr */ \
+ "mr %1,1;" /* %1 = r1 */ \
+@@ -100,8 +100,8 @@
+ { ULong cia, r1, lr; \
+ __asm__ __volatile__( \
+ "mflr 0;" /* r0 = lr */ \
+- "bl .m_libcassert_get_ip;" /* lr = pc */ \
+- ".m_libcassert_get_ip:\n" \
++ "bl 0f;" /* lr = pc */ \
++ "0:\n" \
+ "mflr %0;" /* %0 = pc */ \
+ "mtlr 0;" /* restore lr */ \
+ "mr %1,1;" /* %1 = r1 */ \
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
new file mode 100644
index 0000000..dc99694
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
@@ -0,0 +1,137 @@
+diff -ruN valgrind-3.6.0.orig/coregrind/Makefile.am valgrind-3.6.0/coregrind/Makefile.am
+--- valgrind-3.6.0.orig/coregrind/Makefile.am 2010-10-21 04:19:45.000000000 +0800
++++ valgrind-3.6.0/coregrind/Makefile.am 2010-10-24 20:39:42.655001876 +0800
+@@ -285,23 +285,12 @@
+ m_demangle/demangle.c \
+ m_demangle/dyn-string.c \
+ m_demangle/safe-ctype.c \
+- m_dispatch/dispatch-x86-linux.S \
+- m_dispatch/dispatch-amd64-linux.S \
+- m_dispatch/dispatch-ppc32-linux.S \
+- m_dispatch/dispatch-ppc64-linux.S \
+- m_dispatch/dispatch-arm-linux.S \
+- m_dispatch/dispatch-ppc32-aix5.S \
+- m_dispatch/dispatch-ppc64-aix5.S \
+- m_dispatch/dispatch-x86-darwin.S \
+- m_dispatch/dispatch-amd64-darwin.S \
+ m_initimg/initimg-linux.c \
+ m_initimg/initimg-aix5.c \
+ m_initimg/initimg-darwin.c \
+ m_initimg/initimg-pathscan.c \
+ m_mach/mach_basics.c \
+ m_mach/mach_msg.c \
+- m_mach/mach_traps-x86-darwin.S \
+- m_mach/mach_traps-amd64-darwin.S \
+ m_replacemalloc/replacemalloc_core.c \
+ m_scheduler/scheduler.c \
+ m_scheduler/sema.c \
+@@ -314,15 +303,6 @@
+ m_sigframe/sigframe-ppc64-aix5.c \
+ m_sigframe/sigframe-x86-darwin.c \
+ m_sigframe/sigframe-amd64-darwin.c \
+- m_syswrap/syscall-x86-linux.S \
+- m_syswrap/syscall-amd64-linux.S \
+- m_syswrap/syscall-ppc32-linux.S \
+- m_syswrap/syscall-ppc64-linux.S \
+- m_syswrap/syscall-arm-linux.S \
+- m_syswrap/syscall-ppc32-aix5.S \
+- m_syswrap/syscall-ppc64-aix5.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 \
+@@ -343,6 +323,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_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++ m_start-@VGCONF_ARCH_PRI@-darwin.S \
++ m_start-@VGCONF_ARCH_SEC@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+ $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-21 04:19:39.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-24 20:39:41.462001899 +0800
+@@ -338,11 +338,11 @@
+ ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end ---*/
+ /*--------------------------------------------------------------------*/
+diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-21 04:19:39.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-24 20:39:41.022001883 +0800
+@@ -304,12 +304,11 @@
+ ret
+ .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
+
++#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 -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-21 04:19:41.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-24 20:39:40.576001879 +0800
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished): .quad 5b
+ .previous
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end ---*/
+ /*--------------------------------------------------------------------*/
+diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S
+--- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-21 04:19:41.000000000 +0800
++++ valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-24 20:39:40.152001876 +0800
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed): .long 4b
+ ML_(blksys_finished): .long 5b
+ .previous
++
++#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/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
new file mode 100644
index 0000000..446efac
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
@@ -0,0 +1,26 @@
+diff -Naur valgrind-3.6.1.orig/configure.in valgrind-3.6.1/configure.in
+--- valgrind-3.6.1.orig/configure.in 2011-08-09 09:06:50.000000000 -0400
++++ valgrind-3.6.1/configure.in 2011-08-09 09:21:42.000000000 -0400
+@@ -756,6 +756,13 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.14)
++ AC_MSG_RESULT(2.14 family)
++ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.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}"
++ ;;
+ aix5)
+ AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
+@@ -769,7 +776,7 @@
+
+ *)
+ AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
+ AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ AC_MSG_ERROR([or Darwin libc])
+ ;;
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch b/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch
new file mode 100644
index 0000000..143cfb9
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch
@@ -0,0 +1,11 @@
+--- configure.in 2011-06-09 16:33:14.000000000 -0400
++++ configure.in.orig 2011-06-09 16:33:08.000000000 -0400
+@@ -220,7 +220,7 @@
+ kernel=`uname -r`
+
+ case "${kernel}" in
+- 2.6.*)
++ 2.6.*|3.*)
+ AC_MSG_RESULT([2.6 family (${kernel})])
+ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
+ ;;
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
new file mode 100644
index 0000000..8f7c394
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
@@ -0,0 +1,89 @@
+--- configure.in.orig 2011-02-17 14:29:14.000000000 -0500
++++ configure.in 2011-02-17 15:05:46.000000000 -0500
+@@ -1692,7 +1692,8 @@
+ # NEEDED BY THE REGRESSION TEST PROGRAMS.
+
+
+-# The test below verifies whether the QtCore package been installed.
++# The test below first checks if the user has manaually disabled
++# QtCore. It then verifies whether the QtCore package been installed.
+ # This test works as follows:
+ # - If pkg-config was not installed at the time autogen.sh was run,
+ # the definition of the PKG_CHECK_EXISTS() macro will not be found by
+@@ -1709,37 +1710,49 @@
+ # the pkg-config executable is not present on the system on which the
+ # configure script is run.
+
+-ifdef(
+- [PKG_CHECK_EXISTS],
+- [PKG_CHECK_EXISTS(
+- [QtCore],
++AC_ARG_ENABLE(qtcore,
++ AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
+ [
+- PKG_CHECK_MODULES([QTCORE], [QtCore])
+- # Paranoia: don't trust the result reported by pkg-config, but when
+- # pkg-config reports that QtCore has been found, verify whether linking
+- # programs with QtCore succeeds.
+- AC_LANG(C++)
+- safe_CXXFLAGS="${CXXFLAGS}"
+- CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
+- AC_TRY_LINK(
+- [#include <QMutex>],
+- [QMutex Mutex;],
+- [ac_have_qtcore=yes],
+- [
+- AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
+- ac_have_qtcore=no
+- ]
+- )
+- CXXFLAGS="${safe_CXXFLAGS}"
++ if test x$enableval = xno ; then
++ AC_MSG_CHECKING([for QTCORE ])
++ AC_MSG_RESULT([QTCORE is manually distabled.])
++ [ac_have_qtcore=no]
++ fi
+ ],
+ [
+- ac_have_qtcore=no
++ ifdef(
++ [PKG_CHECK_EXISTS],
++ [PKG_CHECK_EXISTS(
++ [QtCore],
++ [
++ PKG_CHECK_MODULES([QTCORE], [QtCore])
++ # Paranoia: don't trust the result reported by pkg-config, but when
++ # pkg-config reports that QtCore has been found, verify whether linking
++ # programs with QtCore succeeds.
++ AC_LANG(C++)
++ safe_CXXFLAGS="${CXXFLAGS}"
++ CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
++ AC_TRY_LINK(
++ [#include <QMutex>],
++ [QMutex Mutex;],
++ [ac_have_qtcore=yes],
++ [
++ AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
++ ac_have_qtcore=no
++ ]
++ )
++ CXXFLAGS="${safe_CXXFLAGS}"
++ ],
++ [
++ ac_have_qtcore=no
++ ]
++ )
++ ],
++ AC_MSG_WARN([pkg-config has not been installed or is too old.])
++ AC_MSG_WARN([Detection of Qt4 will be skipped.])
++ [ac_have_qtcore=no]
++ )
+ ]
+- )
+- ],
+- AC_MSG_WARN([pkg-config has not been installed or is too old.])
+- AC_MSG_WARN([Detection of Qt4 will be skipped.])
+- [ac_have_qtcore=no]
+ )
+
+ AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
new file mode 100644
index 0000000..92870ed
--- /dev/null
+++ b/dev-util/valgrind/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Valgrind is a GPL'd tool to help you find memory-management problems
+ in your programs. When a program is run under Valgrind's supervision,
+ all reads and writes of memory are checked, and calls to
+ malloc/new/free/delete are intercepted. As a result, Valgrind can
+ detect problems such as
+
+ - Use of uninitialised memory
+ - Reading/writing memory after it has been free'd
+ - Reading/writing off the end of malloc'd blocks
+ - Reading/writing inappropriate areas on the stack
+ - Memory leaks -- where pointers to malloc'd blocks are lost forever
+ - Passing of uninitialised and/or unaddressible memory to system calls
+ - Mismatched use of malloc/new/new [] vs free/delete/delete []
+ - Some abuses of the POSIX Pthreads API
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild
new file mode 100644
index 0000000..b67b98a
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.3 2011/10/28 00:35:54 blueness Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi qt4"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # Respect CFLAGS, LDFLAGS
+ sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
+ mpi/Makefile.am || die
+
+ # Changing Makefile.all.am to disable SSP
+ sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
+ Makefile.all.am || die
+
+ # Correct hard coded doc location
+ sed -i -e "s:doc/valgrind:doc/${PF}:" \
+ docs/Makefile.am || die
+
+ # Yet more local labels, this time for ppc32 & ppc64
+ epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+ # Don't build in empty assembly files for other platforms or we'll get a QA
+ # warning about executable stacks.
+ epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
+
+ # Fix up some suppressions that were not general enough for glibc versions
+ # with more than just a major and minor number.
+ epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
+
+ # Remove automagic dependency on qt4
+ epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
+
+ # Allow valgrind to build against linux-3, bug #370857
+ epatch "${FILESDIR}"/${PN}-3.6.1-linux-3.patch
+
+ # Allow valgrind to build against glibc-2.14, bug #378157
+ epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.14.patch
+
+ # Regenerate autotools files
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression"
+ # while compiling insn_sse.c in none/tests/x86
+ # -fpie valgrind seemingly hangs when built with pie on
+ # amd64 (bug #102157)
+ # -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
+ replace-flags -ggdb3 -ggdb2
+
+ if use amd64 || use ppc64; then
+ ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+ fi
+
+ # Don't use mpicc unless the user asked for it (bug #258832)
+ if ! use mpi; then
+ myconf="${myconf} --without-mpicc"
+ fi
+
+ if ! use qt4; then
+ myconf="${myconf} --disable-qtcore"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS FAQ.txt NEWS README*
+
+ pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+ ewarn "Valgrind will not work if glibc does not have debug symbols."
+ ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+ ewarn "and remerge glibc. See:"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-11-10 22:20 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-11-10 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 952f6b10083887c1d8f5cde7ad3a3edc65d52eb4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 22:20:21 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 22:20:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=952f6b10
dev-util/valgrind: removed patches already applied upstream
---
dev-util/valgrind/ChangeLog | 2 -
dev-util/valgrind/Manifest | 12 +-
.../files/valgrind-3.4.1-glibc-2.10.1.patch | 49 -------
.../files/valgrind-3.6.0-non-exec-stack.patch | 137 --------------------
.../valgrind/files/valgrind-3.6.1-glibc-2.14.patch | 26 ----
.../valgrind/files/valgrind-3.6.1-linux-3.patch | 11 --
.../files/valgrind-3.6.1-user-enable-qt4.patch | 89 -------------
.../files/valgrind-3.7.0-fno-stack-protector.patch | 12 ++
.../files/valgrind-3.7.0-non-exec-stack.patch | 103 +++++++++++++++
.../files/valgrind-3.7.0-respect-flags.patch | 13 ++
dev-util/valgrind/valgrind-3.7.0.ebuild | 28 +---
11 files changed, 139 insertions(+), 343 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 139597f..e69de29 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,2 +0,0 @@
-
-
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index e6daef9..ef43c5a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,10 +1,8 @@
-AUX valgrind-3.4.1-glibc-2.10.1.patch 1305 RMD160 27586a6140bc0c96589f7077a3c9ee266010ac9c SHA1 dc5df31911c93c98d7876fc6ad9157ab62b38de2 SHA256 b250a3f7e8654cbc835570b0647d035f25a866a51312a8c0d82119db474eddd6
AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
-AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
-AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5
-AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582
-AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
+AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
+AUX valgrind-3.7.0-non-exec-stack.patch 3969 RMD160 2b25537e134d7342e9631c77e465ff14cc89428f SHA1 6fee355a7167ec205cb8d128129a1d40e42adba2 SHA256 8a2895e39d2640ab96744ccefe987ddc06dbac8325545c174d9a658e8d631b77
+AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-EBUILD valgrind-3.7.0.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858
-MISC ChangeLog 2 RMD160 e5043315c7d228fbf17daf82b8e725f54b1ac2f6 SHA1 71853c6197a6a7f222db0f1978c7cb232b87c5ee SHA256 75a11da44c802486bc6f65640aa48a730f0f684c5c07a42ba3cd1735eb3fb070
+EBUILD valgrind-3.7.0.ebuild 2701 RMD160 8eb4003298b22ecc72897249ca7975dcfe9406e5 SHA1 2450b2c6c6ca9880dae7e73fff70f70f1435880a SHA256 4f538af9cd1db8f978f61c1898781187240aba463755e2e8187d9dd9af1e5ae9
+MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch b/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
deleted file mode 100644
index 393dc7c..0000000
--- a/dev-util/valgrind/files/valgrind-3.4.1-glibc-2.10.1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- valgrind-3.4.1/glibc-2.X.supp.in.jj 2009-03-01 17:04:51.000000000 -0500
-+++ valgrind-3.4.1/glibc-2.X.supp.in 2009-05-11 11:17:35.605396000 -0400
-@@ -168,9 +168,9 @@
- Memcheck:Param
- socketcall.sendto(msg)
- fun:__sendto_nocancel
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
- glibc24-64bit-padding-1c
-@@ -180,7 +180,7 @@
- fun:__nscd_get_map_ref
- fun:nscd_get*_r
- fun:*nscd*
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
-
-
-@@ -199,18 +199,18 @@
- Memcheck:Param
- socketcall.sendto(msg)
- fun:send
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
- X11-64bit-padding-4b
- Memcheck:Param
- socketcall.send(msg)
- fun:send
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
-
- ##----------------------------------------------------------------------##
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
deleted file mode 100644
index dc99694..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.0-non-exec-stack.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ruN valgrind-3.6.0.orig/coregrind/Makefile.am valgrind-3.6.0/coregrind/Makefile.am
---- valgrind-3.6.0.orig/coregrind/Makefile.am 2010-10-21 04:19:45.000000000 +0800
-+++ valgrind-3.6.0/coregrind/Makefile.am 2010-10-24 20:39:42.655001876 +0800
-@@ -285,23 +285,12 @@
- m_demangle/demangle.c \
- m_demangle/dyn-string.c \
- m_demangle/safe-ctype.c \
-- m_dispatch/dispatch-x86-linux.S \
-- m_dispatch/dispatch-amd64-linux.S \
-- m_dispatch/dispatch-ppc32-linux.S \
-- m_dispatch/dispatch-ppc64-linux.S \
-- m_dispatch/dispatch-arm-linux.S \
-- m_dispatch/dispatch-ppc32-aix5.S \
-- m_dispatch/dispatch-ppc64-aix5.S \
-- m_dispatch/dispatch-x86-darwin.S \
-- m_dispatch/dispatch-amd64-darwin.S \
- m_initimg/initimg-linux.c \
- m_initimg/initimg-aix5.c \
- m_initimg/initimg-darwin.c \
- m_initimg/initimg-pathscan.c \
- m_mach/mach_basics.c \
- m_mach/mach_msg.c \
-- m_mach/mach_traps-x86-darwin.S \
-- m_mach/mach_traps-amd64-darwin.S \
- m_replacemalloc/replacemalloc_core.c \
- m_scheduler/scheduler.c \
- m_scheduler/sema.c \
-@@ -314,15 +303,6 @@
- m_sigframe/sigframe-ppc64-aix5.c \
- m_sigframe/sigframe-x86-darwin.c \
- m_sigframe/sigframe-amd64-darwin.c \
-- m_syswrap/syscall-x86-linux.S \
-- m_syswrap/syscall-amd64-linux.S \
-- m_syswrap/syscall-ppc32-linux.S \
-- m_syswrap/syscall-ppc64-linux.S \
-- m_syswrap/syscall-arm-linux.S \
-- m_syswrap/syscall-ppc32-aix5.S \
-- m_syswrap/syscall-ppc64-aix5.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 \
-@@ -343,6 +323,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_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+ m_start-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_start-@VGCONF_ARCH_SEC@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S
---- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-21 04:19:39.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2010-10-24 20:39:41.462001899 +0800
-@@ -338,11 +338,11 @@
- ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
-
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
-
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end ---*/
- /*--------------------------------------------------------------------*/
-diff -ruN valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S
---- valgrind-3.6.0.orig/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-21 04:19:39.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_dispatch/dispatch-x86-linux.S 2010-10-24 20:39:41.022001883 +0800
-@@ -304,12 +304,11 @@
- ret
- .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
-
-+#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 -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S
---- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-21 04:19:41.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-amd64-linux.S 2010-10-24 20:39:40.576001879 +0800
-@@ -205,11 +205,11 @@
- ML_(blksys_finished): .quad 5b
- .previous
-
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
-
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- end ---*/
- /*--------------------------------------------------------------------*/
-diff -ruN valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S
---- valgrind-3.6.0.orig/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-21 04:19:41.000000000 +0800
-+++ valgrind-3.6.0/coregrind/m_syswrap/syscall-x86-linux.S 2010-10-24 20:39:40.152001876 +0800
-@@ -164,12 +164,12 @@
- ML_(blksys_committed): .long 4b
- ML_(blksys_finished): .long 5b
- .previous
-+
-+#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/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
deleted file mode 100644
index 446efac..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur valgrind-3.6.1.orig/configure.in valgrind-3.6.1/configure.in
---- valgrind-3.6.1.orig/configure.in 2011-08-09 09:06:50.000000000 -0400
-+++ valgrind-3.6.1/configure.in 2011-08-09 09:21:42.000000000 -0400
-@@ -756,6 +756,13 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.14)
-+ AC_MSG_RESULT(2.14 family)
-+ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.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}"
-+ ;;
- aix5)
- AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
- AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
-@@ -769,7 +776,7 @@
-
- *)
- AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
-- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
-+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
- AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
- AC_MSG_ERROR([or Darwin libc])
- ;;
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch b/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch
deleted file mode 100644
index 143cfb9..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-linux-3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in 2011-06-09 16:33:14.000000000 -0400
-+++ configure.in.orig 2011-06-09 16:33:08.000000000 -0400
-@@ -220,7 +220,7 @@
- kernel=`uname -r`
-
- case "${kernel}" in
-- 2.6.*)
-+ 2.6.*|3.*)
- AC_MSG_RESULT([2.6 family (${kernel})])
- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x])
- ;;
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch b/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
deleted file mode 100644
index 8f7c394..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.1-user-enable-qt4.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.in.orig 2011-02-17 14:29:14.000000000 -0500
-+++ configure.in 2011-02-17 15:05:46.000000000 -0500
-@@ -1692,7 +1692,8 @@
- # NEEDED BY THE REGRESSION TEST PROGRAMS.
-
-
--# The test below verifies whether the QtCore package been installed.
-+# The test below first checks if the user has manaually disabled
-+# QtCore. It then verifies whether the QtCore package been installed.
- # This test works as follows:
- # - If pkg-config was not installed at the time autogen.sh was run,
- # the definition of the PKG_CHECK_EXISTS() macro will not be found by
-@@ -1709,37 +1710,49 @@
- # the pkg-config executable is not present on the system on which the
- # configure script is run.
-
--ifdef(
-- [PKG_CHECK_EXISTS],
-- [PKG_CHECK_EXISTS(
-- [QtCore],
-+AC_ARG_ENABLE(qtcore,
-+ AS_HELP_STRING(--enable-qtcore, compile with qtcore support),
- [
-- PKG_CHECK_MODULES([QTCORE], [QtCore])
-- # Paranoia: don't trust the result reported by pkg-config, but when
-- # pkg-config reports that QtCore has been found, verify whether linking
-- # programs with QtCore succeeds.
-- AC_LANG(C++)
-- safe_CXXFLAGS="${CXXFLAGS}"
-- CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
-- AC_TRY_LINK(
-- [#include <QMutex>],
-- [QMutex Mutex;],
-- [ac_have_qtcore=yes],
-- [
-- AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
-- ac_have_qtcore=no
-- ]
-- )
-- CXXFLAGS="${safe_CXXFLAGS}"
-+ if test x$enableval = xno ; then
-+ AC_MSG_CHECKING([for QTCORE ])
-+ AC_MSG_RESULT([QTCORE is manually distabled.])
-+ [ac_have_qtcore=no]
-+ fi
- ],
- [
-- ac_have_qtcore=no
-+ ifdef(
-+ [PKG_CHECK_EXISTS],
-+ [PKG_CHECK_EXISTS(
-+ [QtCore],
-+ [
-+ PKG_CHECK_MODULES([QTCORE], [QtCore])
-+ # Paranoia: don't trust the result reported by pkg-config, but when
-+ # pkg-config reports that QtCore has been found, verify whether linking
-+ # programs with QtCore succeeds.
-+ AC_LANG(C++)
-+ safe_CXXFLAGS="${CXXFLAGS}"
-+ CXXFLAGS="${QTCORE_CFLAGS} ${QTCORE_LIBS} $mflag_primary"
-+ AC_TRY_LINK(
-+ [#include <QMutex>],
-+ [QMutex Mutex;],
-+ [ac_have_qtcore=yes],
-+ [
-+ AC_MSG_WARN([Although pkg-config detected Qt4, linking Qt4 programs fails. Skipping Qt4.])
-+ ac_have_qtcore=no
-+ ]
-+ )
-+ CXXFLAGS="${safe_CXXFLAGS}"
-+ ],
-+ [
-+ ac_have_qtcore=no
-+ ]
-+ )
-+ ],
-+ AC_MSG_WARN([pkg-config has not been installed or is too old.])
-+ AC_MSG_WARN([Detection of Qt4 will be skipped.])
-+ [ac_have_qtcore=no]
-+ )
- ]
-- )
-- ],
-- AC_MSG_WARN([pkg-config has not been installed or is too old.])
-- AC_MSG_WARN([Detection of Qt4 will be skipped.])
-- [ac_have_qtcore=no]
- )
-
- AM_CONDITIONAL([HAVE_QTCORE], [test x$ac_have_qtcore = xyes])
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
new file mode 100644
index 0000000..6af4553
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
+--- valgrind-3.7.0.orig//Makefile.all.am 2011-10-26 17:24:45.000000000 -0400
++++ valgrind-3.7.0/Makefile.all.am 2011-11-10 16:18:18.000000000 -0500
+@@ -82,7 +82,7 @@
+ # performance and get whatever useful warnings we can out of gcc.
+ # -fno-builtin is important for defeating LLVM's idiom recognition
+ # that somehow causes VG_(memset) to get into infinite recursion.
+-AM_CFLAGS_BASE = \
++AM_CFLAGS_BASE = -fno-stack-protector \
+ -O2 -g \
+ -Wall \
+ -Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
new file mode 100644
index 0000000..a2d1c0c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
@@ -0,0 +1,103 @@
+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-10-27 06:55:06.000000000 -0400
++++ valgrind-3.7.0/coregrind/Makefile.am 2011-11-10 16:43:33.000000000 -0500
+@@ -292,14 +292,6 @@
+ m_demangle/demangle.c \
+ m_demangle/dyn-string.c \
+ m_demangle/safe-ctype.c \
+- m_dispatch/dispatch-x86-linux.S \
+- m_dispatch/dispatch-amd64-linux.S \
+- m_dispatch/dispatch-ppc32-linux.S \
+- m_dispatch/dispatch-ppc64-linux.S \
+- m_dispatch/dispatch-arm-linux.S \
+- m_dispatch/dispatch-s390x-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_initimg/initimg-pathscan.c \
+ m_mach/mach_basics.c \
+ m_mach/mach_msg.c \
+- m_mach/mach_traps-x86-darwin.S \
+- m_mach/mach_traps-amd64-darwin.S \
+ m_replacemalloc/replacemalloc_core.c \
+ m_scheduler/scheduler.c \
+ m_scheduler/sema.c \
+@@ -335,14 +325,6 @@
+ m_sigframe/sigframe-s390x-linux.c \
+ m_sigframe/sigframe-x86-darwin.c \
+ m_sigframe/sigframe-amd64-darwin.c \
+- m_syswrap/syscall-x86-linux.S \
+- m_syswrap/syscall-amd64-linux.S \
+- m_syswrap/syscall-ppc32-linux.S \
+- m_syswrap/syscall-ppc64-linux.S \
+- m_syswrap/syscall-arm-linux.S \
+- m_syswrap/syscall-s390x-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,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_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++ m_start-@VGCONF_ARCH_PRI@-darwin.S \
++ m_start-@VGCONF_ARCH_SEC@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ 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_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-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 16:46:00.000000000 -0500
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished): .quad 5b
+ .previous
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- 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-10-26 17:24:42.000000000 -0400
++++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 16:46:20.000000000 -0500
+@@ -164,12 +164,12 @@
+ ML_(blksys_committed): .long 4b
+ 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
++
+ /*--------------------------------------------------------------------*/
+ /*--- end ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
new file mode 100644
index 0000000..860e09c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig//mpi/Makefile.am 2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am 2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+
+ EXTRA_DIST = \
+ mpiwrap_type_test.c
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild
index b67b98a..9c5a52a 100644
--- a/dev-util/valgrind/valgrind-3.7.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.7.0.ebuild
@@ -18,37 +18,21 @@ DEPEND="mpi? ( virtual/mpi )"
RDEPEND="${DEPEND}"
src_prepare() {
+ # Correct hard coded doc location
+ sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
# Respect CFLAGS, LDFLAGS
- sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
- mpi/Makefile.am || die
+ epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
# Changing Makefile.all.am to disable SSP
- sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
- Makefile.all.am || die
-
- # Correct hard coded doc location
- sed -i -e "s:doc/valgrind:doc/${PF}:" \
- docs/Makefile.am || die
+ epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
# Yet more local labels, this time for ppc32 & ppc64
epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
# Don't build in empty assembly files for other platforms or we'll get a QA
# warning about executable stacks.
- epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
-
- # Fix up some suppressions that were not general enough for glibc versions
- # with more than just a major and minor number.
- epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
-
- # Remove automagic dependency on qt4
- epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
-
- # Allow valgrind to build against linux-3, bug #370857
- epatch "${FILESDIR}"/${PN}-3.6.1-linux-3.patch
-
- # Allow valgrind to build against glibc-2.14, bug #378157
- epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.14.patch
+ epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
# Regenerate autotools files
eautoreconf
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-11-10 23:40 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-11-10 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 33742aad2a8de339d8e5585fa6806879635605e5
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 23:25:01 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 23:25:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=33742aad
dev-util/valgrind: fix broken regex to get gcc version
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
dev-util/valgrind/Manifest | 13 ++++++++++++-
.../files/valgrind-3.7.0-fix-gcc-regex.patch | 12 ++++++++++++
dev-util/valgrind/valgrind-3.7.0.ebuild | 13 ++++++-------
3 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index ef43c5a..9855589 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
+AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1
AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
AUX valgrind-3.7.0-non-exec-stack.patch 3969 RMD160 2b25537e134d7342e9631c77e465ff14cc89428f SHA1 6fee355a7167ec205cb8d128129a1d40e42adba2 SHA256 8a2895e39d2640ab96744ccefe987ddc06dbac8325545c174d9a658e8d631b77
AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-EBUILD valgrind-3.7.0.ebuild 2701 RMD160 8eb4003298b22ecc72897249ca7975dcfe9406e5 SHA1 2450b2c6c6ca9880dae7e73fff70f70f1435880a SHA256 4f538af9cd1db8f978f61c1898781187240aba463755e2e8187d9dd9af1e5ae9
+EBUILD valgrind-3.7.0.ebuild 2726 RMD160 4f33f83a028a2451fc048650e2bd7ac5d6146046 SHA1 bf9d790fc367d9f7f9aefb283bade21ba7a20354 SHA256 3ebede13d5452bf625811391800bc73d034581167e6e2d793cceff6eeffab152
MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk68XU0ACgkQl5yvQNBFVTXF+wCeOusigud1vgyrqGvZc6KF+t7e
+sI0An3d0UMurrCDgw5Vmc8lL6DADU7SC
+=X6mT
+-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
new file mode 100644
index 0000000..3233333
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
+--- valgrind-3.7.0.orig//configure.in 2011-11-05 07:13:30.000000000 -0400
++++ valgrind-3.7.0/configure.in 2011-11-10 18:13:39.000000000 -0500
+@@ -109,7 +109,7 @@
+ | head -n 1 \
+ | $SED 's/i686-apple-darwin10//' \
+ | $SED 's/i686-apple-darwin11//' \
+- | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
++ | $SED 's/.*\s\([.0-9]*\)$/\1/'`]
+
+ is_clang="notclang"
+ if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild
index 9c5a52a..af76df0 100644
--- a/dev-util/valgrind/valgrind-3.7.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.7.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.3 2011/10/28 00:35:54 blueness Exp $
-EAPI=2
+EAPI=4
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -12,7 +12,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi qt4"
+IUSE="mpi"
DEPEND="mpi? ( virtual/mpi )"
RDEPEND="${DEPEND}"
@@ -34,6 +34,9 @@ src_prepare() {
# warning about executable stacks.
epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
+ # The regex to get gcc's version is broken
+ epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
+
# Regenerate autotools files
eautoreconf
}
@@ -62,15 +65,11 @@ src_configure() {
myconf="${myconf} --without-mpicc"
fi
- if ! use qt4; then
- myconf="${myconf} --disable-qtcore"
- fi
-
econf ${myconf}
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
dodoc AUTHORS FAQ.txt NEWS README*
pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-11-11 1:10 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-11-11 1:10 UTC (permalink / raw
To: gentoo-commits
commit: 334767628baf35e29bd03ed62c331a6e889f4ef8
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 01:10:05 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 01:10:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=33476762
dev-util/valgrind: fixed non-exec-stack patch
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
dev-util/valgrind/Manifest | 8 ++--
.../files/valgrind-3.7.0-non-exec-stack.patch | 47 +++++++++++++++++---
2 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 9855589..7a72117 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1
AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
-AUX valgrind-3.7.0-non-exec-stack.patch 3969 RMD160 2b25537e134d7342e9631c77e465ff14cc89428f SHA1 6fee355a7167ec205cb8d128129a1d40e42adba2 SHA256 8a2895e39d2640ab96744ccefe987ddc06dbac8325545c174d9a658e8d631b77
+AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
EBUILD valgrind-3.7.0.ebuild 2726 RMD160 4f33f83a028a2451fc048650e2bd7ac5d6146046 SHA1 bf9d790fc367d9f7f9aefb283bade21ba7a20354 SHA256 3ebede13d5452bf625811391800bc73d034581167e6e2d793cceff6eeffab152
@@ -13,7 +13,7 @@ MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREIAAYFAk68XU0ACgkQl5yvQNBFVTXF+wCeOusigud1vgyrqGvZc6KF+t7e
-sI0An3d0UMurrCDgw5Vmc8lL6DADU7SC
-=X6mT
+iEYEAREIAAYFAk68de0ACgkQl5yvQNBFVTXbFwCeKy7jQCQIiPirpFdYhPQ8bBPW
+AvgAnRBsQk6JlXgCjL4It9AsIYx+26uT
+=IuFq
-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
index a2d1c0c..d6cc26d 100644
--- a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
@@ -1,6 +1,6 @@
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-10-27 06:55:06.000000000 -0400
-+++ valgrind-3.7.0/coregrind/Makefile.am 2011-11-10 16:43:33.000000000 -0500
+--- 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 @@
m_demangle/demangle.c \
m_demangle/dyn-string.c \
@@ -65,9 +65,44 @@ 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)
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- 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)
+
+-
++#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 -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-10-26 17:24:42.000000000 -0400
-+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-amd64-linux.S 2011-11-10 16:46:00.000000000 -0500
+--- 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
@@ -205,11 +205,11 @@
ML_(blksys_finished): .quad 5b
.previous
@@ -83,8 +118,8 @@ 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-10-26 17:24:42.000000000 -0400
-+++ valgrind-3.7.0/coregrind/m_syswrap/syscall-x86-linux.S 2011-11-10 16:46:20.000000000 -0500
+--- 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
ML_(blksys_finished): .long 5b
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2011-11-11 1:42 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2011-11-11 1:42 UTC (permalink / raw
To: gentoo-commits
commit: aa7ec86aa2bc899a9d9f2e032fcc5ba85f49e5d1
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 01:42:05 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 01:42:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=aa7ec86a
dev-util/valgrind: moved to tree
---
dev-util/valgrind/Manifest | 19 ---
.../files/valgrind-3.6.0-local-labels.patch | 24 ----
.../files/valgrind-3.7.0-fix-gcc-regex.patch | 12 --
.../files/valgrind-3.7.0-fno-stack-protector.patch | 12 --
.../files/valgrind-3.7.0-non-exec-stack.patch | 138 --------------------
.../files/valgrind-3.7.0-respect-flags.patch | 13 --
dev-util/valgrind/metadata.xml | 23 ----
dev-util/valgrind/valgrind-3.7.0.ebuild | 85 ------------
8 files changed, 0 insertions(+), 326 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
deleted file mode 100644
index 7a72117..0000000
--- a/dev-util/valgrind/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
-AUX valgrind-3.7.0-fix-gcc-regex.patch 581 RMD160 ab1bcd6f79b208f73ea6cc1f4cde1cefc07b74ca SHA1 63820c292db0b245f056629f2cf4247bcad7ecff SHA256 697049e69b5fe85211dab18e471ac4c8d18a50c1fa650466dcba2cacca322bd1
-AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
-AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
-AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
-DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-EBUILD valgrind-3.7.0.ebuild 2726 RMD160 4f33f83a028a2451fc048650e2bd7ac5d6146046 SHA1 bf9d790fc367d9f7f9aefb283bade21ba7a20354 SHA256 3ebede13d5452bf625811391800bc73d034581167e6e2d793cceff6eeffab152
-MISC ChangeLog 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk68de0ACgkQl5yvQNBFVTXbFwCeKy7jQCQIiPirpFdYhPQ8bBPW
-AvgAnRBsQk6JlXgCjL4It9AsIYx+26uT
-=IuFq
------END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
deleted file mode 100644
index 68e6822..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
-+++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
-@@ -81,8 +81,8 @@
- { UInt cia, r1, lr; \
- __asm__ __volatile__( \
- "mflr 0;" /* r0 = lr */ \
-- "bl m_libcassert_get_ip;" /* lr = pc */ \
-- "m_libcassert_get_ip:\n" \
-+ "bl 0f;" /* lr = pc */ \
-+ "0:\n" \
- "mflr %0;" /* %0 = pc */ \
- "mtlr 0;" /* restore lr */ \
- "mr %1,1;" /* %1 = r1 */ \
-@@ -100,8 +100,8 @@
- { ULong cia, r1, lr; \
- __asm__ __volatile__( \
- "mflr 0;" /* r0 = lr */ \
-- "bl .m_libcassert_get_ip;" /* lr = pc */ \
-- ".m_libcassert_get_ip:\n" \
-+ "bl 0f;" /* lr = pc */ \
-+ "0:\n" \
- "mflr %0;" /* %0 = pc */ \
- "mtlr 0;" /* restore lr */ \
- "mr %1,1;" /* %1 = r1 */ \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
deleted file mode 100644
index 3233333..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in
---- valgrind-3.7.0.orig//configure.in 2011-11-05 07:13:30.000000000 -0400
-+++ valgrind-3.7.0/configure.in 2011-11-10 18:13:39.000000000 -0500
-@@ -109,7 +109,7 @@
- | head -n 1 \
- | $SED 's/i686-apple-darwin10//' \
- | $SED 's/i686-apple-darwin11//' \
-- | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
-+ | $SED 's/.*\s\([.0-9]*\)$/\1/'`]
-
- is_clang="notclang"
- if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
deleted file mode 100644
index 6af4553..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
---- valgrind-3.7.0.orig//Makefile.all.am 2011-10-26 17:24:45.000000000 -0400
-+++ valgrind-3.7.0/Makefile.all.am 2011-11-10 16:18:18.000000000 -0500
-@@ -82,7 +82,7 @@
- # performance and get whatever useful warnings we can out of gcc.
- # -fno-builtin is important for defeating LLVM's idiom recognition
- # that somehow causes VG_(memset) to get into infinite recursion.
--AM_CFLAGS_BASE = \
-+AM_CFLAGS_BASE = -fno-stack-protector \
- -O2 -g \
- -Wall \
- -Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
deleted file mode 100644
index d6cc26d..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-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 @@
- m_demangle/demangle.c \
- m_demangle/dyn-string.c \
- m_demangle/safe-ctype.c \
-- m_dispatch/dispatch-x86-linux.S \
-- m_dispatch/dispatch-amd64-linux.S \
-- m_dispatch/dispatch-ppc32-linux.S \
-- m_dispatch/dispatch-ppc64-linux.S \
-- m_dispatch/dispatch-arm-linux.S \
-- m_dispatch/dispatch-s390x-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_initimg/initimg-pathscan.c \
- m_mach/mach_basics.c \
- m_mach/mach_msg.c \
-- m_mach/mach_traps-x86-darwin.S \
-- m_mach/mach_traps-amd64-darwin.S \
- m_replacemalloc/replacemalloc_core.c \
- m_scheduler/scheduler.c \
- m_scheduler/sema.c \
-@@ -335,14 +325,6 @@
- m_sigframe/sigframe-s390x-linux.c \
- m_sigframe/sigframe-x86-darwin.c \
- m_sigframe/sigframe-amd64-darwin.c \
-- m_syswrap/syscall-x86-linux.S \
-- m_syswrap/syscall-amd64-linux.S \
-- m_syswrap/syscall-ppc32-linux.S \
-- m_syswrap/syscall-ppc64-linux.S \
-- m_syswrap/syscall-arm-linux.S \
-- m_syswrap/syscall-s390x-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,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_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+ m_start-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_start-@VGCONF_ARCH_SEC@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+
- 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)
-
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
-
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- 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)
-
--
-+#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 -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
-@@ -205,11 +205,11 @@
- ML_(blksys_finished): .quad 5b
- .previous
-
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
-
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- 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
- 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
-+
- /*--------------------------------------------------------------------*/
- /*--- end ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
deleted file mode 100644
index 860e09c..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
---- valgrind-3.7.0.orig//mpi/Makefile.am 2011-10-26 17:24:23.000000000 -0400
-+++ valgrind-3.7.0/mpi/Makefile.am 2011-11-10 16:03:14.000000000 -0500
-@@ -7,9 +7,6 @@
- CC = $(MPI_CC)
- DEFS =
- DEFAULT_INCLUDES =
--CPPFLAGS =
--CFLAGS =
--LDFLAGS =
-
- EXTRA_DIST = \
- mpiwrap_type_test.c
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
deleted file mode 100644
index 92870ed..0000000
--- a/dev-util/valgrind/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- </maintainer>
- <longdescription>
- Valgrind is a GPL'd tool to help you find memory-management problems
- in your programs. When a program is run under Valgrind's supervision,
- all reads and writes of memory are checked, and calls to
- malloc/new/free/delete are intercepted. As a result, Valgrind can
- detect problems such as
-
- - Use of uninitialised memory
- - Reading/writing memory after it has been free'd
- - Reading/writing off the end of malloc'd blocks
- - Reading/writing inappropriate areas on the stack
- - Memory leaks -- where pointers to malloc'd blocks are lost forever
- - Passing of uninitialised and/or unaddressible memory to system calls
- - Mismatched use of malloc/new/new [] vs free/delete/delete []
- - Some abuses of the POSIX Pthreads API
- </longdescription>
-</pkgmetadata>
diff --git a/dev-util/valgrind/valgrind-3.7.0.ebuild b/dev-util/valgrind/valgrind-3.7.0.ebuild
deleted file mode 100644
index af76df0..0000000
--- a/dev-util/valgrind/valgrind-3.7.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.3 2011/10/28 00:35:54 blueness Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Correct hard coded doc location
- sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
- # Respect CFLAGS, LDFLAGS
- epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
- # Changing Makefile.all.am to disable SSP
- epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
- # Yet more local labels, this time for ppc32 & ppc64
- epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
-
- # 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.patch
-
- # The regex to get gcc's version is broken
- epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
-
- # Regenerate autotools files
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression"
- # while compiling insn_sse.c in none/tests/x86
- # -fpie valgrind seemingly hangs when built with pie on
- # amd64 (bug #102157)
- # -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
- replace-flags -ggdb3 -ggdb2
-
- if use amd64 || use ppc64; then
- ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
- fi
-
- # Don't use mpicc unless the user asked for it (bug #258832)
- if ! use mpi; then
- myconf="${myconf} --without-mpicc"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS FAQ.txt NEWS README*
-
- pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
-}
-
-pkg_postinst() {
- ewarn "Valgrind will not work if glibc does not have debug symbols."
- ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
- ewarn "and remerge glibc. See:"
- ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
- ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
- ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2012-01-05 4:07 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2012-01-05 4:07 UTC (permalink / raw
To: gentoo-commits
commit: 48d9937f30007dfef0ed8b82b6b3c941ed2b8bd5
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 04:07:07 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 04:07:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=48d9937f
dev-util/valgrind: address bug #397429
(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535)
---
dev-util/valgrind/Manifest | 19 +++
.../files/valgrind-3.6.0-local-labels.patch | 24 ++++
.../files/valgrind-3.7.0-automake-1.11.2.patch | 24 ++++
.../files/valgrind-3.7.0-fix-gcc-regex.patch | 35 +++++
.../files/valgrind-3.7.0-fno-stack-protector.patch | 12 ++
.../files/valgrind-3.7.0-non-exec-stack.patch | 138 ++++++++++++++++++++
.../files/valgrind-3.7.0-respect-flags.patch | 13 ++
dev-util/valgrind/metadata.xml | 23 ++++
dev-util/valgrind/valgrind-3.7.0-r2.ebuild | 88 +++++++++++++
9 files changed, 376 insertions(+), 0 deletions(-)
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
new file mode 100644
index 0000000..ed658ba
--- /dev/null
+++ b/dev-util/valgrind/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
+AUX valgrind-3.7.0-automake-1.11.2.patch 1012 RMD160 7a0bbe583423d3fb313040ceb7f9a2baa928b221 SHA1 cd9c95a3701ea9eb2e2caa3439b8c2e2ba3cdc9f SHA256 416939b3f6722992f3023a5f8e4df8713a8aaa2b184b14a57a094d4627040599
+AUX valgrind-3.7.0-fix-gcc-regex.patch 1723 RMD160 f4fdc113f58d7151315f6a65a262471d4f8a75db SHA1 7ed537bcc935a40001a3d11fbff353e9cee342d5 SHA256 3a587d7dcc1ed447cc006cfef0cfb3597f17c96ac8adc7adbdc14d313a1d6852
+AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
+AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
+AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
+DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
+EBUILD valgrind-3.7.0-r2.ebuild 2827 RMD160 2bd96b971686e20678b49de02f9a705db9c7ca2f SHA1 c24fc712b76261be8161a3939f9ae443b983ef45 SHA256 abae11fa86b3c4d8f445d7337e1078b563952b7b09bf70c216c260065bbe850e
+MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEUEAREIAAYFAk8FIesACgkQl5yvQNBFVTU9ggCgjvm5PuJOPgcRlLwgdrs+feMH
+XvoAljiKcTzl/8Hi2MxIp/AsXO7aKCY=
+=3Zpf
+-----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
new file mode 100644
index 0000000..68e6822
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
@@ -0,0 +1,24 @@
+--- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
++++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
+@@ -81,8 +81,8 @@
+ { UInt cia, r1, lr; \
+ __asm__ __volatile__( \
+ "mflr 0;" /* r0 = lr */ \
+- "bl m_libcassert_get_ip;" /* lr = pc */ \
+- "m_libcassert_get_ip:\n" \
++ "bl 0f;" /* lr = pc */ \
++ "0:\n" \
+ "mflr %0;" /* %0 = pc */ \
+ "mtlr 0;" /* restore lr */ \
+ "mr %1,1;" /* %1 = r1 */ \
+@@ -100,8 +100,8 @@
+ { ULong cia, r1, lr; \
+ __asm__ __volatile__( \
+ "mflr 0;" /* r0 = lr */ \
+- "bl .m_libcassert_get_ip;" /* lr = pc */ \
+- ".m_libcassert_get_ip:\n" \
++ "bl 0f;" /* lr = pc */ \
++ "0:\n" \
+ "mflr %0;" /* %0 = pc */ \
+ "mtlr 0;" /* restore lr */ \
+ "mr %1,1;" /* %1 = r1 */ \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
new file mode 100644
index 0000000..2c286f9
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
@@ -0,0 +1,24 @@
+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 2012-01-04 22:46:34.000000000 -0500
++++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-04 22:48:51.000000000 -0500
+@@ -495,7 +495,7 @@
+ m_gdbserver/powerpc-altivec64l.xml
+
+ # so as to make sure these get copied into the install tree
+-pkglib_DATA = $(GDBSERVER_XML_FILES)
++pkgdata_DATA = $(GDBSERVER_XML_FILES)
+
+ # so as to make sure these get copied into the tarball
+ EXTRA_DIST += $(GDBSERVER_XML_FILES)
+diff -Naur valgrind-3.7.0.orig//Makefile.am valgrind-3.7.0/Makefile.am
+--- valgrind-3.7.0.orig//Makefile.am 2011-10-26 17:24:45.000000000 -0400
++++ valgrind-3.7.0/Makefile.am 2012-01-04 22:48:58.000000000 -0500
+@@ -61,7 +61,7 @@
+ # default.supp, as it is built from the base .supp files at compile-time.
+ dist_noinst_DATA = $(SUPP_FILES)
+
+-pkglib_DATA = default.supp
++pkgdata_DATA = default.supp
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = valgrind.pc
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
new file mode 100644
index 0000000..feabf06
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
@@ -0,0 +1,35 @@
+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/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
new file mode 100644
index 0000000..6af4553
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
+--- valgrind-3.7.0.orig//Makefile.all.am 2011-10-26 17:24:45.000000000 -0400
++++ valgrind-3.7.0/Makefile.all.am 2011-11-10 16:18:18.000000000 -0500
+@@ -82,7 +82,7 @@
+ # performance and get whatever useful warnings we can out of gcc.
+ # -fno-builtin is important for defeating LLVM's idiom recognition
+ # that somehow causes VG_(memset) to get into infinite recursion.
+-AM_CFLAGS_BASE = \
++AM_CFLAGS_BASE = -fno-stack-protector \
+ -O2 -g \
+ -Wall \
+ -Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
new file mode 100644
index 0000000..d6cc26d
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
@@ -0,0 +1,138 @@
+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 @@
+ m_demangle/demangle.c \
+ m_demangle/dyn-string.c \
+ m_demangle/safe-ctype.c \
+- m_dispatch/dispatch-x86-linux.S \
+- m_dispatch/dispatch-amd64-linux.S \
+- m_dispatch/dispatch-ppc32-linux.S \
+- m_dispatch/dispatch-ppc64-linux.S \
+- m_dispatch/dispatch-arm-linux.S \
+- m_dispatch/dispatch-s390x-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_initimg/initimg-pathscan.c \
+ m_mach/mach_basics.c \
+ m_mach/mach_msg.c \
+- m_mach/mach_traps-x86-darwin.S \
+- m_mach/mach_traps-amd64-darwin.S \
+ m_replacemalloc/replacemalloc_core.c \
+ m_scheduler/scheduler.c \
+ m_scheduler/sema.c \
+@@ -335,14 +325,6 @@
+ m_sigframe/sigframe-s390x-linux.c \
+ m_sigframe/sigframe-x86-darwin.c \
+ m_sigframe/sigframe-amd64-darwin.c \
+- m_syswrap/syscall-x86-linux.S \
+- m_syswrap/syscall-amd64-linux.S \
+- m_syswrap/syscall-ppc32-linux.S \
+- m_syswrap/syscall-ppc64-linux.S \
+- m_syswrap/syscall-arm-linux.S \
+- m_syswrap/syscall-s390x-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,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_SEC@-@VGCONF_OS@.S
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++ m_start-@VGCONF_ARCH_PRI@-darwin.S \
++ m_start-@VGCONF_ARCH_SEC@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
++ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
++endif
++
+ 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)
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- 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)
+
+-
++#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 -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
+@@ -205,11 +205,11 @@
+ ML_(blksys_finished): .quad 5b
+ .previous
+
++#endif // defined(VGP_amd64_linux)
++
+ /* Let the linker know we don't need an executable stack */
+ .section .note.GNU-stack,"",@progbits
+
+-#endif // defined(VGP_amd64_linux)
+-
+ /*--------------------------------------------------------------------*/
+ /*--- 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
+ 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
++
+ /*--------------------------------------------------------------------*/
+ /*--- end ---*/
+ /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
new file mode 100644
index 0000000..860e09c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig//mpi/Makefile.am 2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am 2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+
+ EXTRA_DIST = \
+ mpiwrap_type_test.c
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
new file mode 100644
index 0000000..92870ed
--- /dev/null
+++ b/dev-util/valgrind/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Valgrind is a GPL'd tool to help you find memory-management problems
+ in your programs. When a program is run under Valgrind's supervision,
+ all reads and writes of memory are checked, and calls to
+ malloc/new/free/delete are intercepted. As a result, Valgrind can
+ detect problems such as
+
+ - Use of uninitialised memory
+ - Reading/writing memory after it has been free'd
+ - Reading/writing off the end of malloc'd blocks
+ - Reading/writing inappropriate areas on the stack
+ - Memory leaks -- where pointers to malloc'd blocks are lost forever
+ - Passing of uninitialised and/or unaddressible memory to system calls
+ - Mismatched use of malloc/new/new [] vs free/delete/delete []
+ - Some abuses of the POSIX Pthreads API
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-util/valgrind/valgrind-3.7.0-r2.ebuild b/dev-util/valgrind/valgrind-3.7.0-r2.ebuild
new file mode 100644
index 0000000..729a48a
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/11/23 19:19:48 blueness Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # Correct hard coded doc location
+ sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+ # Respect CFLAGS, LDFLAGS
+ epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+ # Changing Makefile.all.am to disable SSP
+ epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+ # Yet more local labels, this time for ppc32 & ppc64
+ epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+ # 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.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
+
+ # Regenerate autotools files
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression"
+ # while compiling insn_sse.c in none/tests/x86
+ # -fpie valgrind seemingly hangs when built with pie on
+ # amd64 (bug #102157)
+ # -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
+ replace-flags -ggdb3 -ggdb2
+
+ if use amd64 || use ppc64; then
+ ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+ fi
+
+ # Don't use mpicc unless the user asked for it (bug #258832)
+ if ! use mpi; then
+ myconf="${myconf} --without-mpicc"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS FAQ.txt NEWS README*
+
+ pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+ ewarn "Valgrind will not work if glibc does not have debug symbols."
+ ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+ ewarn "and remerge glibc. See:"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+ ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2012-01-07 1:11 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2012-01-07 1:11 UTC (permalink / raw
To: gentoo-commits
commit: 40460f9958d21370ecb7af665f0a93f2ca1fa4a7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 01:11:40 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 01:11:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=40460f99
dev-util/valgrind: testing patch from https://bugs.kde.org/show_bug.cgi?id=290719
---
dev-util/valgrind/ChangeLog | 8 +++++
.../files/valgrind-3.7.0-automake-1.11.2.patch | 33 ++++++++++++++------
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
new file mode 100644
index 0000000..c555d56
--- /dev/null
+++ b/dev-util/valgrind/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-util/valgrind
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 07 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+ files/valgrind-3.7.0-automake-1.11.2.patch:
+ Testing patch from https://bugs.kde.org/show_bug.cgi?id=290719
+
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
index 2c286f9..b0b57bf 100644
--- a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
+++ b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
@@ -1,24 +1,37 @@
-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 2012-01-04 22:46:34.000000000 -0500
-+++ valgrind-3.7.0/coregrind/Makefile.am 2012-01-04 22:48:51.000000000 -0500
-@@ -495,7 +495,7 @@
+From: Gregorio Guidi <gregorio.guidi@gmail.com>
+
+Retain the old behavior of the build system even with automake 1.11.2.
+
+Reported-by: Oleg Bulatov <dmage@bk.ru>
+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 <blueness@gentoo.org>
+
+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)
-+pkgdata_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 -Naur valgrind-3.7.0.orig//Makefile.am valgrind-3.7.0/Makefile.am
---- valgrind-3.7.0.orig//Makefile.am 2011-10-26 17:24:45.000000000 -0400
-+++ valgrind-3.7.0/Makefile.am 2012-01-04 22:48:58.000000000 -0500
-@@ -61,7 +61,7 @@
+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
-+pkgdata_DATA = default.supp
++vgdatadir = $(pkglibdir)
++vgdata_DATA = default.supp
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = valgrind.pc
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
@ 2012-01-08 19:43 Anthony G. Basile
0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2012-01-08 19:43 UTC (permalink / raw
To: gentoo-commits
commit: 0748e9e370a8540a27f849571256851e962c19e0
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 8 19:43:32 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 19:43:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=0748e9e3
dev-util/valgrind: moved to tree, bug #397429
---
dev-util/valgrind/ChangeLog | 8 -
dev-util/valgrind/Manifest | 20 ---
.../files/valgrind-3.6.0-local-labels.patch | 24 ----
.../files/valgrind-3.7.0-automake-1.11.2.patch | 37 -----
.../files/valgrind-3.7.0-fix-gcc-regex.patch | 35 -----
.../files/valgrind-3.7.0-fno-stack-protector.patch | 12 --
.../files/valgrind-3.7.0-non-exec-stack.patch | 138 --------------------
.../files/valgrind-3.7.0-respect-flags.patch | 13 --
dev-util/valgrind/metadata.xml | 23 ----
dev-util/valgrind/valgrind-3.7.0-r2.ebuild | 88 -------------
10 files changed, 0 insertions(+), 398 deletions(-)
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
deleted file mode 100644
index c555d56..0000000
--- a/dev-util/valgrind/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for dev-util/valgrind
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 07 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
- files/valgrind-3.7.0-automake-1.11.2.patch:
- Testing patch from https://bugs.kde.org/show_bug.cgi?id=290719
-
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
deleted file mode 100644
index 9b544fd..0000000
--- a/dev-util/valgrind/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
-AUX valgrind-3.7.0-automake-1.11.2.patch 1436 RMD160 f0c1275c3eaebf8765232dde57557903ba1e07bc SHA1 1604c3060d51dd7ebbe554901ec19632924d4520 SHA256 c5cf935bcb74c1e890183602d34a3d86eae65844cfe034e517dc3667e48b278d
-AUX valgrind-3.7.0-fix-gcc-regex.patch 1723 RMD160 f4fdc113f58d7151315f6a65a262471d4f8a75db SHA1 7ed537bcc935a40001a3d11fbff353e9cee342d5 SHA256 3a587d7dcc1ed447cc006cfef0cfb3597f17c96ac8adc7adbdc14d313a1d6852
-AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
-AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
-AUX valgrind-3.7.0-respect-flags.patch 360 RMD160 b3ca9a393a68d312fa12cd272720e67c8661cfc4 SHA1 2ca0d9474bd4a81d45981bc8433359832d1ce8b9 SHA256 6b1e5938ecafc29428a698296423c71924848b1e746d6ee8a0f1dd91141f1019
-DIST valgrind-3.7.0.tar.bz2 6624216 RMD160 6ffbf04a8ff4eb2555d1a6bd87c0656828830761 SHA1 b412f49895bb8a78fc314047119760b5d36e5b5e SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6
-EBUILD valgrind-3.7.0-r2.ebuild 2827 RMD160 2bd96b971686e20678b49de02f9a705db9c7ca2f SHA1 c24fc712b76261be8161a3939f9ae443b983ef45 SHA256 abae11fa86b3c4d8f445d7337e1078b563952b7b09bf70c216c260065bbe850e
-MISC ChangeLog 285 RMD160 8c9003156bddb7e8ea454ad564e3047112450385 SHA1 175ba4f2588f532bcab97e199c4c663569c7bf91 SHA256 559c7ad8bcf2de8fdb4bc9271ac63c3c53bf0460918ac0ea65570339f133b942
-MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk8HnBMACgkQl5yvQNBFVTWhkACeLaA7lEqlDnWpKGAX3HuWHGVP
-hdoAoJ9TyjVRonsLFbejG8Qjhw7P0Z4u
-=wU7A
------END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
deleted file mode 100644
index 68e6822..0000000
--- a/dev-util/valgrind/files/valgrind-3.6.0-local-labels.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- coregrind/m_libcassert.c 2010-10-21 04:19:45.000000000 +0800
-+++ coregrind/m_libcassert.c 2010-10-24 20:23:17.800001876 +0800
-@@ -81,8 +81,8 @@
- { UInt cia, r1, lr; \
- __asm__ __volatile__( \
- "mflr 0;" /* r0 = lr */ \
-- "bl m_libcassert_get_ip;" /* lr = pc */ \
-- "m_libcassert_get_ip:\n" \
-+ "bl 0f;" /* lr = pc */ \
-+ "0:\n" \
- "mflr %0;" /* %0 = pc */ \
- "mtlr 0;" /* restore lr */ \
- "mr %1,1;" /* %1 = r1 */ \
-@@ -100,8 +100,8 @@
- { ULong cia, r1, lr; \
- __asm__ __volatile__( \
- "mflr 0;" /* r0 = lr */ \
-- "bl .m_libcassert_get_ip;" /* lr = pc */ \
-- ".m_libcassert_get_ip:\n" \
-+ "bl 0f;" /* lr = pc */ \
-+ "0:\n" \
- "mflr %0;" /* %0 = pc */ \
- "mtlr 0;" /* restore lr */ \
- "mr %1,1;" /* %1 = r1 */ \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
deleted file mode 100644
index b0b57bf..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Gregorio Guidi <gregorio.guidi@gmail.com>
-
-Retain the old behavior of the build system even with automake 1.11.2.
-
-Reported-by: Oleg Bulatov <dmage@bk.ru>
-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 <blueness@gentoo.org>
-
-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/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch b/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
deleted file mode 100644
index feabf06..0000000
--- a/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/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
deleted file mode 100644
index 6af4553..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am
---- valgrind-3.7.0.orig//Makefile.all.am 2011-10-26 17:24:45.000000000 -0400
-+++ valgrind-3.7.0/Makefile.all.am 2011-11-10 16:18:18.000000000 -0500
-@@ -82,7 +82,7 @@
- # performance and get whatever useful warnings we can out of gcc.
- # -fno-builtin is important for defeating LLVM's idiom recognition
- # that somehow causes VG_(memset) to get into infinite recursion.
--AM_CFLAGS_BASE = \
-+AM_CFLAGS_BASE = -fno-stack-protector \
- -O2 -g \
- -Wall \
- -Wmissing-prototypes \
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
deleted file mode 100644
index d6cc26d..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-non-exec-stack.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-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 @@
- m_demangle/demangle.c \
- m_demangle/dyn-string.c \
- m_demangle/safe-ctype.c \
-- m_dispatch/dispatch-x86-linux.S \
-- m_dispatch/dispatch-amd64-linux.S \
-- m_dispatch/dispatch-ppc32-linux.S \
-- m_dispatch/dispatch-ppc64-linux.S \
-- m_dispatch/dispatch-arm-linux.S \
-- m_dispatch/dispatch-s390x-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_initimg/initimg-pathscan.c \
- m_mach/mach_basics.c \
- m_mach/mach_msg.c \
-- m_mach/mach_traps-x86-darwin.S \
-- m_mach/mach_traps-amd64-darwin.S \
- m_replacemalloc/replacemalloc_core.c \
- m_scheduler/scheduler.c \
- m_scheduler/sema.c \
-@@ -335,14 +325,6 @@
- m_sigframe/sigframe-s390x-linux.c \
- m_sigframe/sigframe-x86-darwin.c \
- m_sigframe/sigframe-amd64-darwin.c \
-- m_syswrap/syscall-x86-linux.S \
-- m_syswrap/syscall-amd64-linux.S \
-- m_syswrap/syscall-ppc32-linux.S \
-- m_syswrap/syscall-ppc64-linux.S \
-- m_syswrap/syscall-arm-linux.S \
-- m_syswrap/syscall-s390x-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,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_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+ m_start-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_start-@VGCONF_ARCH_SEC@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+
- 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)
-
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
-
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- 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)
-
--
-+#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 -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
-@@ -205,11 +205,11 @@
- ML_(blksys_finished): .quad 5b
- .previous
-
-+#endif // defined(VGP_amd64_linux)
-+
- /* Let the linker know we don't need an executable stack */
- .section .note.GNU-stack,"",@progbits
-
--#endif // defined(VGP_amd64_linux)
--
- /*--------------------------------------------------------------------*/
- /*--- 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
- 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
-+
- /*--------------------------------------------------------------------*/
- /*--- end ---*/
- /*--------------------------------------------------------------------*/
diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
deleted file mode 100644
index 860e09c..0000000
--- a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
---- valgrind-3.7.0.orig//mpi/Makefile.am 2011-10-26 17:24:23.000000000 -0400
-+++ valgrind-3.7.0/mpi/Makefile.am 2011-11-10 16:03:14.000000000 -0500
-@@ -7,9 +7,6 @@
- CC = $(MPI_CC)
- DEFS =
- DEFAULT_INCLUDES =
--CPPFLAGS =
--CFLAGS =
--LDFLAGS =
-
- EXTRA_DIST = \
- mpiwrap_type_test.c
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
deleted file mode 100644
index 92870ed..0000000
--- a/dev-util/valgrind/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- </maintainer>
- <longdescription>
- Valgrind is a GPL'd tool to help you find memory-management problems
- in your programs. When a program is run under Valgrind's supervision,
- all reads and writes of memory are checked, and calls to
- malloc/new/free/delete are intercepted. As a result, Valgrind can
- detect problems such as
-
- - Use of uninitialised memory
- - Reading/writing memory after it has been free'd
- - Reading/writing off the end of malloc'd blocks
- - Reading/writing inappropriate areas on the stack
- - Memory leaks -- where pointers to malloc'd blocks are lost forever
- - Passing of uninitialised and/or unaddressible memory to system calls
- - Mismatched use of malloc/new/new [] vs free/delete/delete []
- - Some abuses of the POSIX Pthreads API
- </longdescription>
-</pkgmetadata>
diff --git a/dev-util/valgrind/valgrind-3.7.0-r2.ebuild b/dev-util/valgrind/valgrind-3.7.0-r2.ebuild
deleted file mode 100644
index 729a48a..0000000
--- a/dev-util/valgrind/valgrind-3.7.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/11/23 19:19:48 blueness Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="mpi"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Correct hard coded doc location
- sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
- # Respect CFLAGS, LDFLAGS
- epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
- # Changing Makefile.all.am to disable SSP
- epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
- # Yet more local labels, this time for ppc32 & ppc64
- epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
-
- # 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.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
-
- # Regenerate autotools files
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression"
- # while compiling insn_sse.c in none/tests/x86
- # -fpie valgrind seemingly hangs when built with pie on
- # amd64 (bug #102157)
- # -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
- replace-flags -ggdb3 -ggdb2
-
- if use amd64 || use ppc64; then
- ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
- fi
-
- # Don't use mpicc unless the user asked for it (bug #258832)
- if ! use mpi; then
- myconf="${myconf} --without-mpicc"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS FAQ.txt NEWS README*
-
- pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
-}
-
-pkg_postinst() {
- ewarn "Valgrind will not work if glibc does not have debug symbols."
- ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
- ewarn "and remerge glibc. See:"
- ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
- ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
- ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-01-08 19:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17 20:42 [gentoo-commits] dev/blueness:master commit in: dev-util/valgrind/, dev-util/valgrind/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2011-02-21 18:17 Anthony G. Basile
2011-11-10 20:56 Anthony G. Basile
2011-11-10 22:20 Anthony G. Basile
2011-11-10 23:40 Anthony G. Basile
2011-11-11 1:10 Anthony G. Basile
2011-11-11 1:42 Anthony G. Basile
2012-01-05 4:07 Anthony G. Basile
2012-01-07 1:11 Anthony G. Basile
2012-01-08 19:43 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox