Date: Tuesday, January 20, 2015 @ 15:32:37
Author: alucryd
Revision: 126308
upgpkg: higan-qt 094-2
Added:
higan-qt/trunk/higan-makefile.patch
Modified:
higan-qt/trunk/PKGBUILD
--+
PKGBUILD |5 ++--
higan-makefile.patch | 58 +
2 files changed, 61 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-01-20 14:26:02 UTC (rev 126307)
+++ PKGBUILD2015-01-20 14:32:37 UTC (rev 126308)
@@ -13,15 +13,16 @@
optdepends=('beat: Delta patcher')
conflicts=('higan-gtk')
source=(http://files.byuu.org/download/higan_v${pkgver}-source.tar.xz;
+'higan-makefile.patch'
'higan')
sha256sums=('5e149df9d50c1066eb97c0d5428d75304da782bba5a87078b87fc311151b'
+'77f2412c47e9855a30c1ea10c49e58c5bceb8c28de29777dd9293553b2a6ab3d'
'c799232a0f67c4b7f40fc6ad05325a6c04e86d78e40f361d02f168a16d11d048')
prepare() {
cd higan_v${pkgver}-source
- sed 's/ -march=native//g' -i Makefile
- sed s/flags :=$/flags := $CXXFLAGS/g -i nall/Makefile
+ patch -Np1 -i ../higan-makefile.patch
moc-qt4 -i -Iphoenix/qt/ -o phoenix/qt/platform.moc
phoenix/qt/platform.moc.hpp
}
Added: higan-makefile.patch
===
--- higan-makefile.patch(rev 0)
+++ higan-makefile.patch2015-01-20 14:32:37 UTC (rev 126308)
@@ -0,0 +1,58 @@
+diff -rupN higan_v094-source.orig/ananke/Makefile
higan_v094-source/ananke/Makefile
+--- higan_v094-source.orig/ananke/Makefile 2015-01-20 14:56:18.634660183
+0100
higan_v094-source/ananke/Makefile 2015-01-20 15:00:39.164662554 +0100
+@@ -2,7 +2,8 @@ include ../nall/Makefile
+ include ../phoenix/Makefile
+
+ path := /usr/local/lib
+-flags := $(flags) -O3 -fomit-frame-pointer -I..
++flags := $(flags) $(CXXFLAGS) -I..
++link := $(link) $(LDFLAGS)
+
+ all:
+ $(compiler) $(cppflags) $(flags) -fPIC -o obj/ananke.o -c ananke.cpp
+diff -rupN higan_v094-source.orig/Makefile higan_v094-source/Makefile
+--- higan_v094-source.orig/Makefile2015-01-20 14:56:18.634660183 +0100
higan_v094-source/Makefile 2015-01-20 15:06:30.531332416 +0100
+@@ -13,8 +13,8 @@ target := ethos
+ # console := true
+
+ # compiler
+-flags += -I. -O3 -fomit-frame-pointer
+-link+=
++flags += $(CXXFLAGS) -I.
++link+= $(LDFLAGS)
+ objects := libco
+
+ # profile-guided optimization mode
+@@ -45,7 +45,7 @@ else ifeq ($(platform),macosx)
+ flags += -march=native
+ else ifeq ($(platform),linux)
+ flags += -march=native
+- link += -s -Wl,-export-dynamic -lX11 -lXext -ldl
++ link += -Wl,-export-dynamic -lX11 -lXext -ldl
+ else ifeq ($(platform),bsd)
+ flags += -march=native
+ link += -s -Wl,-export-dynamic -lX11 -lXext
+diff -rupN higan_v094-source.orig/nall/Makefile higan_v094-source/nall/Makefile
+--- higan_v094-source.orig/nall/Makefile 2015-01-20 14:56:18.641326850
+0100
higan_v094-source/nall/Makefile2015-01-20 15:04:30.104664654 +0100
+@@ -52,13 +52,13 @@ ifeq ($(compiler),)
+ flags :=
+ link :=
+ endif
+-
+- cflags := -x c -std=c99
+- objcflags := -x objective-c -std=c99
+- cppflags := -x c++ -std=c++11
+- objcppflags := -x objective-c++ -std=c++11
+ endif
+
++cflags := -x c -std=c99
++objcflags := -x objective-c -std=c99
++cppflags := -x c++ -std=c++11
++objcppflags := -x objective-c++ -std=c++11
++
+ # cross-compilation support
+ ifeq ($(arch),x86)
+ flags := -m32 $(flags)
