| 1 |
commit: eed44ac50d1a0b0643909f59259751b174879bf1 |
| 2 |
Author: Matthias Schwarzott <zzam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 26 19:07:52 2016 +0000 |
| 4 |
Commit: Matthias Schwarzott <zzam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 26 19:07:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed44ac5 |
| 7 |
|
| 8 |
dev-util/valgrind: drop no longer needed executable stack patch from version 3.12.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
.../files/valgrind-3.12.0-non-exec-stack.patch | 86 ---------------------- |
| 13 |
dev-util/valgrind/valgrind-3.12.0.ebuild | 4 - |
| 14 |
2 files changed, 90 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 7f41eff..00000000 |
| 19 |
--- a/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,86 +0,0 @@ |
| 22 |
-diff -Naur valgrind-3.12.0.orig/coregrind/Makefile.am valgrind-3.12.0/coregrind/Makefile.am |
| 23 |
---- valgrind-3.12.0.orig/coregrind/Makefile.am 2016-10-21 06:37:39.000000000 -0400 |
| 24 |
-+++ valgrind-3.12.0/coregrind/Makefile.am 2016-10-23 16:05:46.904546117 -0400 |
| 25 |
-@@ -359,21 +359,6 @@ |
| 26 |
- m_demangle/dyn-string.c \ |
| 27 |
- m_demangle/d-demangle.c \ |
| 28 |
- m_demangle/safe-ctype.c \ |
| 29 |
-- m_dispatch/dispatch-x86-linux.S \ |
| 30 |
-- m_dispatch/dispatch-amd64-linux.S \ |
| 31 |
-- m_dispatch/dispatch-ppc32-linux.S \ |
| 32 |
-- m_dispatch/dispatch-ppc64be-linux.S \ |
| 33 |
-- m_dispatch/dispatch-ppc64le-linux.S \ |
| 34 |
-- m_dispatch/dispatch-arm-linux.S \ |
| 35 |
-- m_dispatch/dispatch-arm64-linux.S \ |
| 36 |
-- m_dispatch/dispatch-s390x-linux.S \ |
| 37 |
-- m_dispatch/dispatch-mips32-linux.S \ |
| 38 |
-- m_dispatch/dispatch-mips64-linux.S \ |
| 39 |
-- m_dispatch/dispatch-tilegx-linux.S \ |
| 40 |
-- m_dispatch/dispatch-x86-darwin.S \ |
| 41 |
-- m_dispatch/dispatch-amd64-darwin.S \ |
| 42 |
-- m_dispatch/dispatch-x86-solaris.S \ |
| 43 |
-- m_dispatch/dispatch-amd64-solaris.S \ |
| 44 |
- m_gdbserver/inferiors.c \ |
| 45 |
- m_gdbserver/m_gdbserver.c \ |
| 46 |
- m_gdbserver/regcache.c \ |
| 47 |
-@@ -399,8 +384,6 @@ |
| 48 |
- m_initimg/initimg-pathscan.c \ |
| 49 |
- m_mach/mach_basics.c \ |
| 50 |
- m_mach/mach_msg.c \ |
| 51 |
-- m_mach/mach_traps-x86-darwin.S \ |
| 52 |
-- m_mach/mach_traps-amd64-darwin.S \ |
| 53 |
- m_replacemalloc/replacemalloc_core.c \ |
| 54 |
- m_scheduler/sched-lock.c \ |
| 55 |
- m_scheduler/sched-lock-generic.c \ |
| 56 |
-@@ -420,21 +403,6 @@ |
| 57 |
- m_sigframe/sigframe-x86-darwin.c \ |
| 58 |
- m_sigframe/sigframe-amd64-darwin.c \ |
| 59 |
- m_sigframe/sigframe-solaris.c \ |
| 60 |
-- m_syswrap/syscall-x86-linux.S \ |
| 61 |
-- m_syswrap/syscall-amd64-linux.S \ |
| 62 |
-- m_syswrap/syscall-ppc32-linux.S \ |
| 63 |
-- m_syswrap/syscall-ppc64be-linux.S \ |
| 64 |
-- m_syswrap/syscall-ppc64le-linux.S \ |
| 65 |
-- m_syswrap/syscall-arm-linux.S \ |
| 66 |
-- m_syswrap/syscall-arm64-linux.S \ |
| 67 |
-- m_syswrap/syscall-s390x-linux.S \ |
| 68 |
-- m_syswrap/syscall-mips32-linux.S \ |
| 69 |
-- m_syswrap/syscall-mips64-linux.S \ |
| 70 |
-- m_syswrap/syscall-tilegx-linux.S \ |
| 71 |
-- m_syswrap/syscall-x86-darwin.S \ |
| 72 |
-- m_syswrap/syscall-amd64-darwin.S \ |
| 73 |
-- m_syswrap/syscall-x86-solaris.S \ |
| 74 |
-- m_syswrap/syscall-amd64-solaris.S \ |
| 75 |
- m_syswrap/syswrap-main.c \ |
| 76 |
- m_syswrap/syswrap-generic.c \ |
| 77 |
- m_syswrap/syswrap-linux.c \ |
| 78 |
-@@ -461,6 +429,29 @@ |
| 79 |
- m_ume/main.c \ |
| 80 |
- m_ume/script.c |
| 81 |
- |
| 82 |
-+COREGRIND_SOURCES_COMMON += \ |
| 83 |
-+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \ |
| 84 |
-+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S |
| 85 |
-+ |
| 86 |
-+if VGCONF_HAVE_PLATFORM_SEC |
| 87 |
-+COREGRIND_SOURCES_COMMON += \ |
| 88 |
-+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \ |
| 89 |
-+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S |
| 90 |
-+endif |
| 91 |
-+ |
| 92 |
-+if VGCONF_OS_IS_DARWIN |
| 93 |
-+COREGRIND_SOURCES_COMMON += \ |
| 94 |
-+ m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \ |
| 95 |
-+ m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \ |
| 96 |
-+ m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S |
| 97 |
-+if VGCONF_HAVE_PLATFORM_SEC |
| 98 |
-+COREGRIND_SOURCES_COMMON += \ |
| 99 |
-+ m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \ |
| 100 |
-+ m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \ |
| 101 |
-+ m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S |
| 102 |
-+endif |
| 103 |
-+endif |
| 104 |
-+ |
| 105 |
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ |
| 106 |
- $(COREGRIND_SOURCES_COMMON) |
| 107 |
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ |
| 108 |
|
| 109 |
diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild b/dev-util/valgrind/valgrind-3.12.0.ebuild |
| 110 |
index e9e5899..c88c83c 100644 |
| 111 |
--- a/dev-util/valgrind/valgrind-3.12.0.ebuild |
| 112 |
+++ b/dev-util/valgrind/valgrind-3.12.0.ebuild |
| 113 |
@@ -30,10 +30,6 @@ src_prepare() { |
| 114 |
# Changing Makefile.all.am to disable SSP |
| 115 |
epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch |
| 116 |
|
| 117 |
- # Don't build in empty assembly files for other platforms or we'll get a QA |
| 118 |
- # warning about executable stacks. |
| 119 |
- epatch "${FILESDIR}"/${PN}-3.12.0-non-exec-stack.patch |
| 120 |
- |
| 121 |
# Allow users to test their own patches |
| 122 |
epatch_user |
Archives