[patch] proposed patch

0001-dev-util-valgrind-filter-out-more-fstack-protector-C.patch (text/plain), 4.09 KB, created by Austin English (RETIRED) on 2017-12-04 22:49:44 UTC

From 833bd00b5b8ff264b4c6e49c5f09aa7b6436bb83 Mon Sep 17 00:00:00 2001
From: Austin English <[e-mail]>
Date: Mon, 4 Dec 2017 16:48:37 -0600
Subject: [PATCH] dev-util/valgrind: filter out more -fstack-protector-* CFLAGS

Also drop an unneeded patch, upstream has a similar fix already (and we
strip out the CFLAG anyway)

Gentoo-Bug: https://bugs.gentoo.org/620402
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Signed-off-by: Austin English <[e-mail]>
---
 dev-util/valgrind/Manifest               |  4 ++--
 dev-util/valgrind/valgrind-3.13.0.ebuild | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index fd204126f59..10726c96eb2 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,2 +1,2 @@
-DIST valgrind-3.12.0.tar.bz2 12788556 SHA256 67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be WHIRLPOOL 136dd4f358bd18165a5801083cc73fc269a84bf491880af9842e789feea62181e16ca4c099db06fb4ffacf0cb0189b1b29d64790cc4202442f6f6b71ce4c6eea
-DIST valgrind-3.13.0.tar.bz2 14723076 SHA256 d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 WHIRLPOOL 5ec5c371f8fb22813b895eaa3ee1dbb3c32bb998ad4b646d4b252a694d9b40a1543234cb7208445d8ca557e779ce30e9d0503a36bb9e4240a245c5d5d802c8a4
+DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
+DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009
diff --git a/dev-util/valgrind/valgrind-3.13.0.ebuild b/dev-util/valgrind/valgrind-3.13.0.ebuild
index f4d80dc38c7..907cba1706f 100644
--- a/dev-util/valgrind/valgrind-3.13.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.0.ebuild
@@ -26,9 +26,6 @@ src_prepare() {
 	# Respect CFLAGS, LDFLAGS
 	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 
-	# Changing Makefile.all.am to disable SSP
-	eapply "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
-
 	# Allow users to test their own patches
 	eapply_user
 
@@ -42,14 +39,19 @@ src_configure() {
 	# Respect ar, bug #468114
 	tc-export AR
 
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
+	# -fomit-frame-pointer	   "Assembler messages: Error: junk `8' after expression"
+	#                          while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector        more undefined references to __guard and __stack_smash_handler
+	#                          because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			   for multilib-portage, bug #398825
+	# -ggdb3                   segmentation fault on startup
 	filter-flags -fomit-frame-pointer
 	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
 	filter-flags -m64 -mx32
 	replace-flags -ggdb3 -ggdb2
 
-- 
2.13.6