commit: eed44ac50d1a0b0643909f59259751b174879bf1
Author: Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 19:07:52 2016 +0000
Commit: Matthias Schwarzott <zzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 19:07:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed44ac5
dev-util/valgrind: drop no longer needed executable stack patch from version
3.12.0
Package-Manager: portage-2.3.2
.../files/valgrind-3.12.0-non-exec-stack.patch | 86 ----------------------
dev-util/valgrind/valgrind-3.12.0.ebuild | 4 -
2 files changed, 90 deletions(-)
diff --git a/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch
b/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch
deleted file mode 100644
index 7f41eff..00000000
--- a/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur valgrind-3.12.0.orig/coregrind/Makefile.am
valgrind-3.12.0/coregrind/Makefile.am
---- valgrind-3.12.0.orig/coregrind/Makefile.am 2016-10-21 06:37:39.000000000
-0400
-+++ valgrind-3.12.0/coregrind/Makefile.am 2016-10-23 16:05:46.904546117
-0400
-@@ -359,21 +359,6 @@
- m_demangle/dyn-string.c \
- m_demangle/d-demangle.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-ppc64be-linux.S \
-- m_dispatch/dispatch-ppc64le-linux.S \
-- m_dispatch/dispatch-arm-linux.S \
-- m_dispatch/dispatch-arm64-linux.S \
-- m_dispatch/dispatch-s390x-linux.S \
-- m_dispatch/dispatch-mips32-linux.S \
-- m_dispatch/dispatch-mips64-linux.S \
-- m_dispatch/dispatch-tilegx-linux.S \
-- m_dispatch/dispatch-x86-darwin.S \
-- m_dispatch/dispatch-amd64-darwin.S \
-- m_dispatch/dispatch-x86-solaris.S \
-- m_dispatch/dispatch-amd64-solaris.S \
- m_gdbserver/inferiors.c \
- m_gdbserver/m_gdbserver.c \
- m_gdbserver/regcache.c \
-@@ -399,8 +384,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/sched-lock.c \
- m_scheduler/sched-lock-generic.c \
-@@ -420,21 +403,6 @@
- m_sigframe/sigframe-x86-darwin.c \
- m_sigframe/sigframe-amd64-darwin.c \
- m_sigframe/sigframe-solaris.c \
-- m_syswrap/syscall-x86-linux.S \
-- m_syswrap/syscall-amd64-linux.S \
-- m_syswrap/syscall-ppc32-linux.S \
-- m_syswrap/syscall-ppc64be-linux.S \
-- m_syswrap/syscall-ppc64le-linux.S \
-- m_syswrap/syscall-arm-linux.S \
-- m_syswrap/syscall-arm64-linux.S \
-- m_syswrap/syscall-s390x-linux.S \
-- m_syswrap/syscall-mips32-linux.S \
-- m_syswrap/syscall-mips64-linux.S \
-- m_syswrap/syscall-tilegx-linux.S \
-- m_syswrap/syscall-x86-darwin.S \
-- m_syswrap/syscall-amd64-darwin.S \
-- m_syswrap/syscall-x86-solaris.S \
-- m_syswrap/syscall-amd64-solaris.S \
- m_syswrap/syswrap-main.c \
- m_syswrap/syswrap-generic.c \
- m_syswrap/syswrap-linux.c \
-@@ -461,6 +429,29 @@
- 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_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild
b/dev-util/valgrind/valgrind-3.12.0.ebuild
index e9e5899..c88c83c 100644
--- a/dev-util/valgrind/valgrind-3.12.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.12.0.ebuild
@@ -30,10 +30,6 @@ src_prepare() {
# Changing Makefile.all.am to disable SSP
epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.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.12.0-non-exec-stack.patch
-
# Allow users to test their own patches
epatch_user
