diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-06-18 21:16:34 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-06-18 21:16:34 +0000 |
| commit | 5884de7a724942d327017783ef5a7d790d37b253 (patch) | |
| tree | a34801392641dca354b9e8b8034050225a1327b4 | |
| parent | Fix link error with gcc-4.8, bug #466488 (diff) | |
| download | gentoo-2-5884de7a724942d327017783ef5a7d790d37b253.tar.gz gentoo-2-5884de7a724942d327017783ef5a7d790d37b253.tar.bz2 gentoo-2-5884de7a724942d327017783ef5a7d790d37b253.zip | |
Remove old patchy versions
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
22 files changed, 20 insertions, 1457 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog index f3d428aaffce..edc7dfd58ee7 100644 --- a/dev-util/valgrind/ChangeLog +++ b/dev-util/valgrind/ChangeLog @@ -1,6 +1,25 @@ # ChangeLog for dev-util/valgrind # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.170 2013/06/18 20:56:20 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.171 2013/06/18 21:16:33 blueness Exp $ + + 18 Jun 2013; Anthony G. Basile <blueness@gentoo.org> + -files/valgrind-3.4.1-glibc-2.10.1.patch, + -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, -files/valgrind-3.6.0-glibc-2.13.patch, + -files/valgrind-3.6.0-non-exec-stack.patch, + -files/valgrind-3.6.0-strcasecmp.patch, + -files/valgrind-3.6.1-automake-1.11.3.patch, + -files/valgrind-3.6.1-fix-unhandled-opcode.patch, + -files/valgrind-3.6.1-glibc-2.14.patch, + -files/valgrind-3.6.1-glibc-2.15.patch, -files/valgrind-3.6.1-linux-3.patch, + -files/valgrind-3.6.1-user-enable-qt4.patch, -valgrind-3.5.0.ebuild, + -valgrind-3.6.1-r1.ebuild, -valgrind-3.6.1-r3.ebuild, + -valgrind-3.6.1-r4.ebuild, -valgrind-3.6.1.ebuild: + Remove old patchy versions *valgrind-3.8.1-r1 (18 Jun 2013) 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 393dc7c2fc6d..000000000000 --- 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.5.0-glibc-2.11.patch b/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.11.patch deleted file mode 100644 index 393dc0bcf57d..000000000000 --- a/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.11.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ruN valgrind-3.5.0/configure.in valgrind-3.5.0-fixed/configure.in ---- valgrind-3.5.0/configure.in 2009-11-07 23:34:37.000000000 +0100 -+++ valgrind-3.5.0-fixed/configure.in 2009-11-07 23:38:14.000000000 +0100 -@@ -656,6 +656,16 @@ - ], - GLIBC_VERSION="2.10") - -+AC_EGREP_CPP([GLIBC_211], [ -+#include <features.h> -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) -+ GLIBC_211 -+ #endif -+#endif -+], -+GLIBC_VERSION="2.11") -+ - AC_EGREP_CPP([AIX5_LIBC], [ - #include <standards.h> - #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) -@@ -742,6 +752,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.11) -+ AC_MSG_RESULT(2.11 family) -+ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.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]) -@@ -755,7 +772,7 @@ - - *) - AC_MSG_RESULT(unsupported version) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) - 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.5.0-glibc-2.12.patch b/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.12.patch deleted file mode 100644 index 6a02d6bbdb9e..000000000000 --- a/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.12.patch +++ /dev/null @@ -1,56 +0,0 @@ -http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-glibc-2.12.patch?view=log - ---- configure.in -+++ configure.in -@@ -666,6 +666,16 @@ AC_EGREP_CPP([GLIBC_211], [ - ], - GLIBC_VERSION="2.11") - -+AC_EGREP_CPP([GLIBC_212], [ -+#include <features.h> -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12) -+ GLIBC_212 -+ #endif -+#endif -+], -+GLIBC_VERSION="2.12") -+ - AC_EGREP_CPP([AIX5_LIBC], [ - #include <standards.h> - #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) -@@ -759,6 +769,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.12) -+ AC_MSG_RESULT(2.12 family) -+ AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.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]) -@@ -772,7 +789,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT(unsupported version) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; ---- config.h.in -+++ config.h.in -@@ -18,6 +18,9 @@ - /* Define to 1 if you're using glibc 2.11.x */ - #undef GLIBC_2_11 - -+/* Define to 1 if you're using glibc 2.12.x */ -+#undef GLIBC_2_12 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - diff --git a/dev-util/valgrind/files/valgrind-3.5.0-local-labels.patch b/dev-util/valgrind/files/valgrind-3.5.0-local-labels.patch deleted file mode 100644 index 70e559a12edd..000000000000 --- a/dev-util/valgrind/files/valgrind-3.5.0-local-labels.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: coregrind/m_libcassert.c -=================================================================== ---- coregrind/m_libcassert.c (revision 10904) -+++ coregrind/m_libcassert.c (working copy) -@@ -65,8 +65,8 @@ - #elif defined(VGP_ppc32_linux) || defined(VGP_ppc32_aix5) - # define GET_REAL_PC_SP_AND_FP(pc, sp, fp) \ - asm("mflr 0;" /* r0 = lr */ \ -- "bl m_libcassert_get_ip;" /* lr = pc */ \ -- "m_libcassert_get_ip:\n" \ -+ "bl 0f;" /* lr = pc */ \ -+ "0:\n" \ - "mflr %0;" \ - "mtlr 0;" /* restore lr */ \ - "mr %1,1;" \ -@@ -79,8 +79,8 @@ - #elif defined(VGP_ppc64_linux) || defined(VGP_ppc64_aix5) - # define GET_REAL_PC_SP_AND_FP(pc, sp, fp) \ - asm("mflr 0;" /* r0 = lr */ \ -- "bl .m_libcassert_get_ip;" /* lr = pc */ \ -- ".m_libcassert_get_ip:\n" \ -+ "bl 0f;" /* lr = pc */ \ -+ "0:\n" \ - "mflr %0;" \ - "mtlr 0;" /* restore lr */ \ - "mr %1,1;" \ diff --git a/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch b/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch deleted file mode 100644 index fdbb78f62571..000000000000 --- a/dev-util/valgrind/files/valgrind-3.5.0-non-exec-stack.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -ruN valgrind-3.5.0/coregrind/Makefile.am valgrind-3.5.0-fixed/coregrind/Makefile.am ---- valgrind-3.5.0/coregrind/Makefile.am 2009-08-19 15:37:47.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/Makefile.am 2009-11-16 21:38:32.000000000 +0100 -@@ -277,22 +277,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-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 \ -@@ -304,16 +294,6 @@ - m_sigframe/sigframe-ppc64-aix5.c \ - m_sigframe/sigframe-x86-darwin.c \ - m_sigframe/sigframe-amd64-darwin.c \ -- m_start-x86-darwin.S \ -- m_start-amd64-darwin.S \ -- 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-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 \ -@@ -333,6 +313,24 @@ - m_ume/main.c \ - m_ume/script.c - -+COREGRIND_SOURCES_COMMON += \ -+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \ -+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S -+ -+if VGCONF_HAVE_PLATFORM_SEC -+COREGRIND_SOURCES_COMMON += \ -+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \ -+ m_syswrap/syscall-@VGCONF_ARCH_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.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S ---- valgrind-3.5.0/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-08-19 15:37:41.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-amd64-linux.S 2009-11-16 21:38:08.000000000 +0100 -@@ -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.5.0/coregrind/m_dispatch/dispatch-x86-linux.S valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S ---- valgrind-3.5.0/coregrind/m_dispatch/dispatch-x86-linux.S 2009-08-19 15:37:41.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_dispatch/dispatch-x86-linux.S 2009-11-16 21:38:08.000000000 +0100 -@@ -305,11 +305,11 @@ - .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.5.0/coregrind/m_syswrap/syscall-amd64-linux.S valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S ---- valgrind-3.5.0/coregrind/m_syswrap/syscall-amd64-linux.S 2009-08-19 15:37:42.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-amd64-linux.S 2009-11-16 21:38:08.000000000 +0100 -@@ -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.5.0/coregrind/m_syswrap/syscall-x86-linux.S valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S ---- valgrind-3.5.0/coregrind/m_syswrap/syscall-x86-linux.S 2009-08-19 15:37:42.000000000 +0200 -+++ valgrind-3.5.0-fixed/coregrind/m_syswrap/syscall-x86-linux.S 2009-11-16 21:38:08.000000000 +0100 -@@ -165,11 +165,11 @@ - 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.5.0-respect-LDFLAGS.patch b/dev-util/valgrind/files/valgrind-3.5.0-respect-LDFLAGS.patch deleted file mode 100644 index 3b77403df3ac..000000000000 --- a/dev-util/valgrind/files/valgrind-3.5.0-respect-LDFLAGS.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN valgrind-3.5.0/mpi/Makefile.am valgrind-3.5.0-fixed/mpi/Makefile.am ---- valgrind-3.5.0/mpi/Makefile.am 2009-08-19 15:36:29.000000000 +0200 -+++ valgrind-3.5.0-fixed/mpi/Makefile.am 2009-10-05 20:17:59.000000000 +0200 -@@ -8,8 +8,8 @@ - DEFS = - DEFAULT_INCLUDES = - CPPFLAGS = --CFLAGS = --LDFLAGS = -+#CFLAGS = -+#LDFLAGS = - - EXTRA_DIST = \ - libmpiwrap_aix5.exp \ diff --git a/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch b/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch deleted file mode 100644 index 402676d096ee..000000000000 --- a/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch +++ /dev/null @@ -1,50 +0,0 @@ -http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-stat_h.patch?view=log - ---- include/vki/vki-amd64-linux.h -+++ include/vki/vki-amd64-linux.h -@@ -310,6 +310,9 @@ struct vki_stat { - long st_blksize; - long st_blocks; /* Number 512-byte blocks allocated. */ - -+#undef st_atime -+#undef st_mtime -+#undef st_ctime - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; ---- include/vki/vki-x86-linux.h -+++ include/vki/vki-x86-linux.h -@@ -348,6 +348,9 @@ struct vki_stat { - unsigned long st_size; - unsigned long st_blksize; - unsigned long st_blocks; -+#undef st_atime -+#undef st_mtime -+#undef st_ctime - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; ---- include/vki/vki-ppc32-linux.h -+++ include/vki/vki-ppc32-linux.h -@@ -392,6 +392,9 @@ struct vki_stat { - long st_size; - unsigned long st_blksize; - unsigned long st_blocks; -+#undef st_atime -+#undef st_mtime -+#undef st_ctime - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; ---- include/vki/vki-ppc64-linux.h -+++ include/vki/vki-ppc64-linux.h -@@ -428,6 +428,9 @@ struct vki_stat { - long st_size; - unsigned long st_blksize; - unsigned long st_blocks; -+#undef st_atime -+#undef st_mtime -+#undef st_ctime - unsigned long st_atime; - unsigned long st_atime_nsec; - unsigned long st_mtime; diff --git a/dev-util/valgrind/files/valgrind-3.6.0-glibc-2.13.patch b/dev-util/valgrind/files/valgrind-3.6.0-glibc-2.13.patch deleted file mode 100644 index efe75b495a79..000000000000 --- a/dev-util/valgrind/files/valgrind-3.6.0-glibc-2.13.patch +++ /dev/null @@ -1,56 +0,0 @@ -http://pkgs.fedoraproject.org/gitweb/?p=valgrind.git;a=summary - ---- valgrind/configure.in -+++ valgrind/configure.in -@@ -649,6 +649,16 @@ _ACEOF - GLIBC_VERSION="`$CPP conftest.$ac_ext | $SED -n 's/^glibc version is: //p' | $SED 's/ /./g'`" - fi - -+AC_EGREP_CPP([GLIBC_213], [ -+#include <features.h> -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 13) -+ GLIBC_213 -+ #endif -+#endif -+], -+GLIBC_VERSION="2.13") -+ - AC_EGREP_CPP([AIX5_LIBC], [ - #include <standards.h> - #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) -@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.13) -+ AC_MSG_RESULT(2.13 family) -+ AC_DEFINE([GLIBC_2_13], 1, [Define to 1 if you're using glibc 2.13.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]) -@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; ---- valgrind/config.h.in -+++ valgrind/config.h.in -@@ -33,6 +33,9 @@ - /* Define to 1 if you're using glibc 2.12.x */ - #undef GLIBC_2_12 - -+/* Define to 1 if you're using glibc 2.13.x */ -+#undef GLIBC_2_13 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - 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 dc9969484a12..000000000000 --- 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.0-strcasecmp.patch b/dev-util/valgrind/files/valgrind-3.6.0-strcasecmp.patch deleted file mode 100644 index c406dfbaaad4..000000000000 --- a/dev-util/valgrind/files/valgrind-3.6.0-strcasecmp.patch +++ /dev/null @@ -1,116 +0,0 @@ -http://pkgs.fedoraproject.org/gitweb/?p=valgrind.git;a=summary - ---- valgrind/memcheck/mc_replace_strmem.c -+++ valgrind/memcheck/mc_replace_strmem.c -@@ -431,6 +430,111 @@ STRCMP(VG_Z_LD64_SO_1, strcmp - #endif - - -+#if defined(VGO_linux) -+extern int tolower (int); -+ -+#define STRCASECMP(soname, fnname) \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2 ); \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2 ) \ -+ { \ -+ register unsigned char c1; \ -+ register unsigned char c2; \ -+ while (True) { \ -+ c1 = tolower(*(unsigned char *)s1); \ -+ c2 = tolower(*(unsigned char *)s2); \ -+ if (c1 != c2) break; \ -+ if (c1 == 0) break; \ -+ s1++; s2++; \ -+ } \ -+ if (c1 < c2) return -1; \ -+ if (c1 > c2) return 1; \ -+ return 0; \ -+ } -+ -+STRCASECMP(VG_Z_LIBC_SONAME, strcasecmp) -+STRCASECMP(VG_Z_LIBC_SONAME, __GI_strcasecmp) -+ -+ -+#define STRNCASECMP(soname, fnname) \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2, SizeT nmax ); \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2, SizeT nmax ) \ -+ { \ -+ register unsigned char c1; \ -+ register unsigned char c2; \ -+ SizeT n = 0; \ -+ while (True) { \ -+ if (n >= nmax) return 0; \ -+ if (*s1 == 0 && *s2 == 0) return 0; \ -+ if (*s1 == 0) return -1; \ -+ if (*s2 == 0) return 1; \ -+ c1 = tolower(*(unsigned char*)s1); \ -+ c2 = tolower(*(unsigned char*)s2); \ -+ if (c1 < c2) return -1; \ -+ if (c1 > c2) return 1; \ -+ s1++; s2++; n++; \ -+ } \ -+ } -+ -+STRNCASECMP(VG_Z_LIBC_SONAME, strncasecmp) -+STRNCASECMP(VG_Z_LIBC_SONAME, __GI_strncasecmp) -+ -+extern int tolower_l (int, void *) __attribute__((weak)); -+ -+#define STRCASECMP_L(soname, fnname) \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2, void* l ); \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2, void* l ) \ -+ { \ -+ register unsigned char c1; \ -+ register unsigned char c2; \ -+ while (True) { \ -+ c1 = tolower_l(*(unsigned char *)s1, l); \ -+ c2 = tolower_l(*(unsigned char *)s2, l); \ -+ if (c1 != c2) break; \ -+ if (c1 == 0) break; \ -+ s1++; s2++; \ -+ } \ -+ if (c1 < c2) return -1; \ -+ if (c1 > c2) return 1; \ -+ return 0; \ -+ } -+ -+STRCASECMP_L(VG_Z_LIBC_SONAME, strcasecmp_l) -+STRCASECMP_L(VG_Z_LIBC_SONAME, __GI_strcasecmp_l) -+ -+ -+#define STRNCASECMP_L(soname, fnname) \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2, SizeT nmax, void* l ); \ -+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \ -+ ( const char* s1, const char* s2, SizeT nmax, void* l ) \ -+ { \ -+ register unsigned char c1; \ -+ register unsigned char c2; \ -+ SizeT n = 0; \ -+ while (True) { \ -+ if (n >= nmax) return 0; \ -+ if (*s1 == 0 && *s2 == 0) return 0; \ -+ if (*s1 == 0) return -1; \ -+ if (*s2 == 0) return 1; \ -+ c1 = tolower_l(*(unsigned char*)s1, l); \ -+ c2 = tolower_l(*(unsigned char*)s2, l); \ -+ if (c1 < c2) return -1; \ -+ if (c1 > c2) return 1; \ -+ s1++; s2++; n++; \ -+ } \ -+ } -+ -+STRNCASECMP_L(VG_Z_LIBC_SONAME, strncasecmp_l) -+STRNCASECMP_L(VG_Z_LIBC_SONAME, __GI_strncasecmp_l) -+#endif -+ -+ - #define MEMCHR(soname, fnname) \ - void* VG_REPLACE_FUNCTION_ZU(soname,fnname) (const void *s, int c, SizeT n); \ - void* VG_REPLACE_FUNCTION_ZU(soname,fnname) (const void *s, int c, SizeT n) \ diff --git a/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch b/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch deleted file mode 100644 index 4c1eda338505..000000000000 --- a/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch +++ /dev/null @@ -1,26 +0,0 @@ -Backport of valgrind-3.7.0-automake-1.11.2.patch - -Retain the old behavior of the build system even with automake 1.11.3. - -Reported-by: Oleg Bulatov <dmage@bk.ru> -X-Gentoo-Bug: 397429 -X-Gentoo-Bug: 403779 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429 -X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=403779 -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 -Naur valgrind-3.6.1.orig//Makefile.am valgrind-3.6.1/Makefile.am ---- valgrind-3.6.1.orig//Makefile.am 2010-10-20 16:19:45.000000000 -0400 -+++ valgrind-3.6.1/Makefile.am 2012-02-16 20:27:23.000000000 -0500 -@@ -57,7 +57,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.6.1-fix-unhandled-opcode.patch b/dev-util/valgrind/files/valgrind-3.6.1-fix-unhandled-opcode.patch deleted file mode 100644 index bb8ef9467d63..000000000000 --- a/dev-util/valgrind/files/valgrind-3.6.1-fix-unhandled-opcode.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Naur valgrind-3.6.1.orig/coregrind/m_debuginfo/debuginfo.c valgrind-3.6.1/coregrind/m_debuginfo/debuginfo.c ---- valgrind-3.6.1.orig/coregrind/m_debuginfo/debuginfo.c 2010-10-20 16:19:43.000000000 -0400 -+++ valgrind-3.6.1/coregrind/m_debuginfo/debuginfo.c 2012-02-16 21:10:53.000000000 -0500 -@@ -1958,6 +1958,14 @@ - case Cop_Sub: return wL - wR; - case Cop_And: return wL & wR; - case Cop_Mul: return wL * wR; -+ case Cop_Shl: return wL << wR; -+ case Cop_Shr: return wL >> wR; -+ case Cop_Eq: return wL == wR ? 1 : 0; -+ case Cop_Ge: return (Word) wL >= (Word) wR ? 1 : 0; -+ case Cop_Gt: return (Word) wL > (Word) wR ? 1 : 0; -+ case Cop_Le: return (Word) wL <= (Word) wR ? 1 : 0; -+ case Cop_Lt: return (Word) wL < (Word) wR ? 1 : 0; -+ case Cop_Ne: return wL != wR ? 1 : 0; - default: goto unhandled; - } - /*NOTREACHED*/ -diff -Naur valgrind-3.6.1.orig/coregrind/m_debuginfo/priv_storage.h valgrind-3.6.1/coregrind/m_debuginfo/priv_storage.h ---- valgrind-3.6.1.orig/coregrind/m_debuginfo/priv_storage.h 2010-10-20 16:19:43.000000000 -0400 -+++ valgrind-3.6.1/coregrind/m_debuginfo/priv_storage.h 2012-02-16 21:10:49.000000000 -0500 -@@ -218,7 +218,15 @@ - Cop_Add=0x321, - Cop_Sub, - Cop_And, -- Cop_Mul -+ Cop_Mul, -+ Cop_Shl, -+ Cop_Shr, -+ Cop_Eq, -+ Cop_Ge, -+ Cop_Gt, -+ Cop_Le, -+ Cop_Lt, -+ Cop_Ne - } - CfiOp; - -diff -Naur valgrind-3.6.1.orig/coregrind/m_debuginfo/readdwarf.c valgrind-3.6.1/coregrind/m_debuginfo/readdwarf.c ---- valgrind-3.6.1.orig/coregrind/m_debuginfo/readdwarf.c 2010-10-20 16:19:43.000000000 -0400 -+++ valgrind-3.6.1/coregrind/m_debuginfo/readdwarf.c 2012-02-16 21:10:49.000000000 -0500 -@@ -2831,6 +2831,22 @@ - op = Cop_And; opname = "and"; goto binop; - case DW_OP_mul: - op = Cop_Mul; opname = "mul"; goto binop; -+ case DW_OP_shl: -+ op = Cop_Shl; opname = "shl"; goto binop; -+ case DW_OP_shr: -+ op = Cop_Shr; opname = "shr"; goto binop; -+ case DW_OP_eq: -+ op = Cop_Eq; opname = "eq"; goto binop; -+ case DW_OP_ge: -+ op = Cop_Ge; opname = "ge"; goto binop; -+ case DW_OP_gt: -+ op = Cop_Gt; opname = "gt"; goto binop; -+ case DW_OP_le: -+ op = Cop_Le; opname = "le"; goto binop; -+ case DW_OP_lt: -+ op = Cop_Lt; opname = "lt"; goto binop; -+ case DW_OP_ne: -+ op = Cop_Ne; opname = "ne"; goto binop; - binop: - POP( ix ); - POP( ix2 ); -diff -Naur valgrind-3.6.1.orig/coregrind/m_debuginfo/storage.c valgrind-3.6.1/coregrind/m_debuginfo/storage.c ---- valgrind-3.6.1.orig/coregrind/m_debuginfo/storage.c 2010-10-20 16:19:43.000000000 -0400 -+++ valgrind-3.6.1/coregrind/m_debuginfo/storage.c 2012-02-16 21:10:49.000000000 -0500 -@@ -595,6 +595,14 @@ - case Cop_Sub: VG_(printf)("-"); break; - case Cop_And: VG_(printf)("&"); break; - case Cop_Mul: VG_(printf)("*"); break; -+ case Cop_Shl: VG_(printf)("<<"); break; -+ case Cop_Shr: VG_(printf)(">>"); break; -+ case Cop_Eq: VG_(printf)("=="); break; -+ case Cop_Ge: VG_(printf)(">="); break; -+ case Cop_Gt: VG_(printf)(">"); break; -+ case Cop_Le: VG_(printf)("<="); break; -+ case Cop_Lt: VG_(printf)("<"); break; -+ case Cop_Ne: VG_(printf)("!="); break; - default: vg_assert(0); - } - } 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 446efac118ce..000000000000 --- 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-glibc-2.15.patch b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.15.patch deleted file mode 100644 index e5fc184b53d6..000000000000 --- a/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.15.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur valgrind-3.6.1.orig//configure.in valgrind-3.6.1/configure.in ---- valgrind-3.6.1.orig//configure.in 2012-07-25 14:46:59.600964127 +0000 -+++ valgrind-3.6.1/configure.in 2012-07-25 14:48:56.910013096 +0000 -@@ -763,6 +763,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ AC_MSG_RESULT(2.15 family) -+ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - 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]) 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 143cfb9c6745..000000000000 --- 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 8f7c39465d43..000000000000 --- 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.5.0.ebuild b/dev-util/valgrind/valgrind-3.5.0.ebuild deleted file mode 100644 index 11241efd8dc6..000000000000 --- a/dev-util/valgrind/valgrind-3.5.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.5.0.ebuild,v 1.10 2012/04/28 16:50:42 blueness Exp $ - -inherit autotools eutils flag-o-matic toolchain-funcs - -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" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - # make sure our CFLAGS are respected - einfo "Changing configure.in to respect CFLAGS" - sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in - - # undefined references to __guard and __stack_smash_handler in VEX (bug #114347) - einfo "Changing Makefile.all.am to disable SSP" - sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.all.am - - # Correct hard coded doc location - sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am - - # Fix up some suppressions that were not general enough for glibc versions - # with more than just a major and minor number. - epatch "${FILESDIR}/valgrind-3.4.1-glibc-2.10.1.patch" - - # Respect LDFLAGS also for libmpiwrap.so (bug #279194) - epatch "${FILESDIR}/valgrind-3.5.0-respect-LDFLAGS.patch" - - # Yet more local labels, this time for ppc32 & ppc64 - epatch "${FILESDIR}/valgrind-3.5.0-local-labels.patch" - - # Don't just reject glibc-2.11 - epatch "${FILESDIR}/valgrind-3.5.0-glibc-2.11.patch" - - # Don't build in empty assembly files for other platforms or we'll get a QA - # warning about executable stacks. - epatch "${FILESDIR}/valgrind-3.5.0-non-exec-stack.patch" - - # Minimal fixes required for glibc-2.12 - epatch "${FILESDIR}/valgrind-3.5.0-glibc-2.12.patch" - epatch "${FILESDIR}/valgrind-3.5.0-stat_h.patch" - - # Regenerate autotools files - eautoreconf -} - -src_compile() { - 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 - - # gcc 3.3.x fails to compile valgrind with -O3 (bug #129776) - if [ "$(gcc-version)" == "3.3" ] && is-flagq -O3; then - ewarn "GCC 3.3 cannot compile valgrind with -O3 in CFLAGS, using -O2 instead." - replace-flags -O3 -O2 - fi - - 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} || die "Configure failed!" - emake || die "Make failed!" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed!" - dodoc AUTHORS FAQ.txt NEWS README* -} - -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 -} diff --git a/dev-util/valgrind/valgrind-3.6.1-r1.ebuild b/dev-util/valgrind/valgrind-3.6.1-r1.ebuild deleted file mode 100644 index 7545f87e3033..000000000000 --- a/dev-util/valgrind/valgrind-3.6.1-r1.ebuild +++ /dev/null @@ -1,100 +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-r1.ebuild,v 1.4 2011/12/21 15:47:15 josejx 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 - - # Allow valgrind to build against linux-3, bug #370857 - epatch "${FILESDIR}"/${PN}-3.6.1-linux-3.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 -} diff --git a/dev-util/valgrind/valgrind-3.6.1-r3.ebuild b/dev-util/valgrind/valgrind-3.6.1-r3.ebuild deleted file mode 100644 index 0cdeecb3c7c2..000000000000 --- a/dev-util/valgrind/valgrind-3.6.1-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2013 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-r3.ebuild,v 1.5 2013/04/19 12:11:00 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 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 - - # Back port of fix for bug #403179, https://bugs.kde.org/show_bug.cgi?id=277045 - epatch "${FILESDIR}"/${PN}-3.6.1-fix-unhandled-opcode.patch - - # Fix stricter use of dir variables, bugs #397429 and #403779 - epatch "${FILESDIR}"/${PN}-3.6.1-automake-1.11.3.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() { - elog "Valgrind will not work if glibc does not have debug symbols." - elog "To fix this you can add splitdebug to FEATURES in make.conf" - elog "and remerge glibc. See:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=214065" - elog "https://bugs.gentoo.org/show_bug.cgi?id=274771" - elog "https://bugs.gentoo.org/show_bug.cgi?id=388703" -} diff --git a/dev-util/valgrind/valgrind-3.6.1-r4.ebuild b/dev-util/valgrind/valgrind-3.6.1-r4.ebuild deleted file mode 100644 index 2ecb01d87e09..000000000000 --- a/dev-util/valgrind/valgrind-3.6.1-r4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2013 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-r4.ebuild,v 1.5 2013/04/19 12:11:01 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 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 - - # Allow valgrind to build against glibc-2.15, bug #390323 comment 31 - epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.15.patch - - # Back port of fix for bug #403179, https://bugs.kde.org/show_bug.cgi?id=277045 - epatch "${FILESDIR}"/${PN}-3.6.1-fix-unhandled-opcode.patch - - # Fix stricter use of dir variables, bugs #397429 and #403779 - epatch "${FILESDIR}"/${PN}-3.6.1-automake-1.11.3.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() { - elog "Valgrind will not work if glibc does not have debug symbols." - elog "To fix this you can add splitdebug to FEATURES in make.conf" - elog "and remerge glibc. See:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=214065" - elog "https://bugs.gentoo.org/show_bug.cgi?id=274771" - elog "https://bugs.gentoo.org/show_bug.cgi?id=388703" -} 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 e780cd238594..000000000000 --- a/dev-util/valgrind/valgrind-3.6.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1.ebuild,v 1.6 2012/05/10 09:28:16 grobian 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 -} |