dev-lisp/sbcl: in 1.3.13, patch out -no-pie also on x86

Bug: 607302

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/dev-lisp/sbcl/files/sbcl-1.3.13-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.13-config.patch
new file mode 100644 (file)
index 0000000..e20fc07
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.3.13-config.patch
@@ -0,0 +1,32 @@
+diff -r -U2 sbcl-1.3.13.orig/src/runtime/Config.x86-64-linux sbcl-1.3.13/src/runtime/Config.x86-64-linux
+--- sbcl-1.3.13.orig/src/runtime/Config.x86-64-linux   2016-12-31 09:38:30.000000000 +0100
++++ sbcl-1.3.13/src/runtime/Config.x86-64-linux        2017-02-05 16:11:54.801938872 +0100
+@@ -58,12 +58,4 @@
+ endif
+ 
+-# The following works for Ubuntu 16.10. There must be a better way to
+-# do this across various flavors of linux.
+-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
+-CFLAGS += -fno-pie
+-LINKFLAGS += -no-pie
+-LDFLAGS += -no-pie
+-endif
+-
+ # Nothing to do for after-grovel-headers.
+ .PHONY: after-grovel-headers
+diff -r -U2 sbcl-1.3.13.orig/src/runtime/Config.x86-linux sbcl-1.3.13/src/runtime/Config.x86-linux
+--- sbcl-1.3.13.orig/src/runtime/Config.x86-linux      2016-12-31 09:38:30.000000000 +0100
++++ sbcl-1.3.13/src/runtime/Config.x86-linux   2017-02-05 16:10:16.882945480 +0100
+@@ -50,12 +50,4 @@
+ endif
+ 
+-# The following works for Ubuntu 16.10. There must be a better way to
+-# do this across various flavors of linux.
+-ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),)
+-CFLAGS += -fno-pie
+-LINKFLAGS += -no-pie
+-LDFLAGS += -no-pie
+-endif
+-
+ GC_SRC = gencgc.c
+ 

diff --git a/dev-lisp/sbcl/sbcl-1.3.13.ebuild b/dev-lisp/sbcl/sbcl-1.3.13.ebuild
index c23ea8b3d537fd4cefcfb53507ecc6c81994a244..7d7266e818653650e475562980cb36c9f83e8c95 100644 (file)
--- a/dev-lisp/sbcl/sbcl-1.3.13.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.3.13.ebuild
@@ -101,8 +101,8 @@ src_prepare() {
        eapply "${FILESDIR}"/bsd-sockets-test-1.3.12.patch
        # bugs #560276, #561018
        eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
-       # bug #599902
-       eapply "${FILESDIR}"/${PN}-1.3.11-config.patch
+       # bug #599902, #607302
+       eapply "${FILESDIR}"/${PN}-1.3.13-config.patch
 
        eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
        eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch