summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2016-11-17 00:37:42 +0700
committerAndrey Grozin <grozin@gentoo.org>2016-11-17 00:37:42 +0700
commit7bfab2119e74409da904f5e21e19463cc17ca43b (patch)
tree3ba0413e879b7eac2371d3fc88f2583fa6a7bdd5
parentprofiles/package.mask: clean up obsolete entries. (diff)
downloadgentoo-7bfab2119e74409da904f5e21e19463cc17ca43b.tar.gz
gentoo-7bfab2119e74409da904f5e21e19463cc17ca43b.tar.bz2
gentoo-7bfab2119e74409da904f5e21e19463cc17ca43b.zip
dev-lisp/sbcl: fix problem with hardened gcc in 1.3.11
Bug: 599902 Package-Manager: portage-2.3.0
-rw-r--r--dev-lisp/sbcl/files/sbcl-1.3.11-config.patch16
-rw-r--r--dev-lisp/sbcl/sbcl-1.3.11.ebuild2
2 files changed, 18 insertions, 0 deletions
diff --git a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
new file mode 100644
index 000000000000..e23f1e6d9bcb
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch
@@ -0,0 +1,16 @@
+diff -r -U2 sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux sbcl-1.3.11/src/runtime/Config.x86-64-linux
+--- sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux 2016-10-30 23:28:43.000000000 +0700
++++ sbcl-1.3.11/src/runtime/Config.x86-64-linux 2016-11-16 23:27:37.248815622 +0700
+@@ -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 --git a/dev-lisp/sbcl/sbcl-1.3.11.ebuild b/dev-lisp/sbcl/sbcl-1.3.11.ebuild
index 3681769c6be0..334669e1ad69 100644
--- a/dev-lisp/sbcl/sbcl-1.3.11.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.3.11.ebuild
@@ -101,6 +101,8 @@ src_prepare() {
eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
# bugs #560276, #561018
eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+ # bug #599902
+ eapply "${FILESDIR}"/${PN}-1.3.11-config.patch
eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch