| 1 |
commit: 51e4688bec125d055da2a97af526690f0d7026b4 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 15 13:11:49 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 15 13:11:49 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e4688b |
| 7 |
|
| 8 |
games-emulation/mupen64plus-ui-console: Replace broken sed with patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
...mupen64plus-ui-console-2.5.9-fix-makefile.patch | 32 ++++++++++++++++++++++ |
| 14 |
.../mupen64plus-ui-console-2.5.9.ebuild | 21 ++++++-------- |
| 15 |
2 files changed, 41 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-emulation/mupen64plus-ui-console/files/mupen64plus-ui-console-2.5.9-fix-makefile.patch b/games-emulation/mupen64plus-ui-console/files/mupen64plus-ui-console-2.5.9-fix-makefile.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..c14491e7049 |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-emulation/mupen64plus-ui-console/files/mupen64plus-ui-console-2.5.9-fix-makefile.patch |
| 22 |
@@ -0,0 +1,32 @@ |
| 23 |
+--- a/projects/unix/Makefile |
| 24 |
++++ b/projects/unix/Makefile |
| 25 |
+@@ -94,7 +94,7 @@ |
| 26 |
+ ifeq ($(ARCH_DETECTED), 64BITS) |
| 27 |
+ CFLAGS += -pipe -arch x86_64 -mmacosx-version-min=10.6 -isysroot $(OSX_SDK_PATH) |
| 28 |
+ else |
| 29 |
+- CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.6 -isysroot $(OSX_SDK_PATH) |
| 30 |
++ CFLAGS += -pipe -arch i686 -mmacosx-version-min=10.6 -isysroot $(OSX_SDK_PATH) |
| 31 |
+ endif |
| 32 |
+ endif |
| 33 |
+ endif |
| 34 |
+@@ -172,20 +172,6 @@ |
| 35 |
+ COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c |
| 36 |
+ LINK.o = $(Q_LD)$(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) |
| 37 |
+ |
| 38 |
+-ifeq ($(PIE), 1) |
| 39 |
+- CFLAGS += -fPIE |
| 40 |
+- LDFLAGS += -pie |
| 41 |
+-else |
| 42 |
+- CFLAGS += -fno-PIE |
| 43 |
+- ifeq ($(CC),$(CROSS_COMPILE)gcc) |
| 44 |
+- # check if PIE is the default for the compiler |
| 45 |
+- PIE_DEFAULT = $(shell $(CC) -v 2>&1 | grep enable-default-pie) |
| 46 |
+- ifneq ($(PIE_DEFAULT),) |
| 47 |
+- LDFLAGS += -no-pie |
| 48 |
+- endif |
| 49 |
+- endif |
| 50 |
+-endif |
| 51 |
+- |
| 52 |
+ # set installation options |
| 53 |
+ ifeq ($(PREFIX),) |
| 54 |
+ PREFIX := /usr/local |
| 55 |
|
| 56 |
diff --git a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.9.ebuild b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.9.ebuild |
| 57 |
index 1741ecc220c..ec20f855224 100644 |
| 58 |
--- a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.9.ebuild |
| 59 |
+++ b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5.9.ebuild |
| 60 |
@@ -15,23 +15,20 @@ SLOT="0" |
| 61 |
KEYWORDS="~amd64 ~x86" |
| 62 |
IUSE="" |
| 63 |
|
| 64 |
-RDEPEND=">=games-emulation/mupen64plus-core-${PV}:0= |
| 65 |
+RDEPEND=" |
| 66 |
+ >=games-emulation/mupen64plus-core-${PV}:0= |
| 67 |
media-libs/libsdl2:0= |
| 68 |
!<games-emulation/mupen64plus-2.0" |
| 69 |
-DEPEND="${RDEPEND} |
| 70 |
- virtual/pkgconfig" |
| 71 |
+DEPEND="${RDEPEND}" |
| 72 |
+BDEPEND="virtual/pkgconfig" |
| 73 |
|
| 74 |
S=${WORKDIR}/${MY_P} |
| 75 |
|
| 76 |
-src_prepare() { |
| 77 |
- default |
| 78 |
- |
| 79 |
- # avoid implicitly appending CPU flags |
| 80 |
- sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die |
| 81 |
- |
| 82 |
- # avoid appending -fPIE/-fno-PIE |
| 83 |
- sed -i -e '/^if.*PIE/,/endif/d' projects/unix/Makefile || die |
| 84 |
-} |
| 85 |
+PATCHES=( |
| 86 |
+ # 1. avoid implicitly appending CPU flags |
| 87 |
+ # 2. avoid appending -fPIE/-fno-PIE |
| 88 |
+ "${FILESDIR}"/${PN}-2.5.9-fix-makefile.patch |
| 89 |
+) |
| 90 |
|
| 91 |
src_compile() { |
| 92 |
MAKEARGS=( |
Archives