From: Chema Alonso Josa <nimiux@gentoo.org>
Date: Wed, 23 Aug 2017 21:07:40 +0000 (+0200)
Subject: dev-lisp/sbcl: Fixes user CFLAGS and LDFLAGS substitution.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=681843319ce07628158193753b0f77391625e252;p=gentoo.git

dev-lisp/sbcl: Fixes user CFLAGS and LDFLAGS substitution.

Gentoo-Bug: 620532

Package-Manager: Portage-2.3.6, Repoman-2.3.1
---

diff --git a/dev-lisp/sbcl/sbcl-1.3.20.ebuild b/dev-lisp/sbcl/sbcl-1.3.20.ebuild
index 3665ca2582b3..a6c44f0043ba 100644
--- a/dev-lisp/sbcl/sbcl-1.3.20.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.3.20.ebuild
@@ -107,9 +107,11 @@ src_prepare() {
 
 	eapply_user
 
-	# bug #526194
-	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
-		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+	# bugs #526194 and #620532
+	sed -e "s@CFLAGS +=.*\$@CFLAGS = ${CFLAGS} -Wall -Wsign-compare -Wpointer-arith@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS = ${LDFLAGS}@" \
+		-e "s@LINKFLAGS += -no-pie\$@LINKFLAGS = ${LDFLAGS} -no-pie@" \
+		-e "s@LINKFLAGS += -nopie\$@LINKFLAGS = ${LDFLAGS} -nopie@" \
 		-i src/runtime/GNUmakefile || die
 
 	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \