dev-lisp/sbcl: Fix CFLAGS and LINKFLAGS to let users override the default values

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/dev-lisp/sbcl/sbcl-1.4.0.ebuild b/dev-lisp/sbcl/sbcl-1.4.0.ebuild
index 9f565e6c9e053503634db17069894451693ce5b5..962d6c37cbef646e4d9de61166a1858e708b47b4 100644 (file)
--- a/dev-lisp/sbcl/sbcl-1.4.0.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.4.0.ebuild
@@ -107,11 +107,19 @@ src_prepare() {
 
        eapply_user
 
-       # bugs #526194, #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@" \
+       # Make sure the *FLAGS variables are sane.
+       # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+       strip-unsupported-flags
+       filter-flags -fomit-frame-pointer -Wl,-s
+       filter-ldflags -s
+
+       # original bugs #526194, #620532
+       # this broke no-pie default builds, c.f. bug #632670
+       # Pass CFLAGS down by appending our value, to let users override
+       # the default values.
+       # Keep passing LDFLAGS down via the LINKFLAGS variable.
+       sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+               -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
                -i src/runtime/GNUmakefile || die
 
        sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
@@ -148,8 +156,6 @@ src_configure() {
 src_compile() {
        local bindir="${WORKDIR}"/sbcl-binary
 
-       strip-unsupported-flags ; filter-flags -fomit-frame-pointer
-
        if use pax_kernel ; then
                # To disable PaX on hardened systems
                pax-mark -mr "${bindir}"/src/runtime/sbcl