| 1 |
commit: b2832338426a96d988945b1b8e3af751ff27ba26 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 9 20:41:13 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 9 20:41:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2832338 |
| 7 |
|
| 8 |
games-roguelike/angband: fix build on pie gcc, bug #617982 |
| 9 |
|
| 10 |
Reported-by: Toralf Förster |
| 11 |
Bug: https://bugs.gentoo.org/617982 |
| 12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 13 |
|
| 14 |
games-roguelike/angband/angband-4.0.5-r1.ebuild | 4 +++- |
| 15 |
games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch | 13 +++++++++++++ |
| 16 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild b/games-roguelike/angband/angband-4.0.5-r1.ebuild |
| 19 |
index 473728f8c4a..48866f76317 100644 |
| 20 |
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild |
| 21 |
+++ b/games-roguelike/angband/angband-4.0.5-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2016 Gentoo Foundation |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND} |
| 29 |
dev-python/docutils |
| 30 |
virtual/pkgconfig" |
| 31 |
|
| 32 |
+PATCHES=("${FILESDIR}"/${P}-pie-gcc.patch) |
| 33 |
+ |
| 34 |
src_prepare() { |
| 35 |
default |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..b4f3c5707d4 |
| 41 |
--- /dev/null |
| 42 |
+++ b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch |
| 43 |
@@ -0,0 +1,13 @@ |
| 44 |
+Allow gcc to construct correct partial linking command to ld. |
| 45 |
+Otherwise ld gets an incompatible mix of '-pie -r'. |
| 46 |
+ |
| 47 |
+https://bugs.gentoo.org/617982 |
| 48 |
+diff --git a/src/Makefile b/src/Makefile |
| 49 |
+index 79be4cc..d27bb91 100644 |
| 50 |
+--- a/src/Makefile |
| 51 |
++++ b/src/Makefile |
| 52 |
+@@ -33,3 +33,3 @@ win/$(PROGNAME).res: win/$(PROGNAME).rc |
| 53 |
+ $(PROGNAME).o: $(OBJECTS) |
| 54 |
+- $(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS) |
| 55 |
++ $(LD) -nostdlib -r -o $@ $(OBJECTS) |
| 56 |
+ @printf "%10s %-20s\n" LINK $@ |
Archives