diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-19 07:35:20 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-19 20:09:53 +0100 |
| commit | 88a5d1099cebec9be1c26cbc2e71fa23b6d99c92 (patch) | |
| tree | 6479b9ee6d55277b91382a206ad08f3e10d57a93 /games-puzzle/picpuz/files | |
| parent | games-emulation/fbzx: respect ${PKG_CONFIG} (diff) | |
| download | gentoo-88a5d1099cebec9be1c26cbc2e71fa23b6d99c92.tar.gz gentoo-88a5d1099cebec9be1c26cbc2e71fa23b6d99c92.tar.bz2 gentoo-88a5d1099cebec9be1c26cbc2e71fa23b6d99c92.zip | |
games-puzzle/picpuz: respect ${PKG_CONFIG}, CXX
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-puzzle/picpuz/files')
| -rw-r--r-- | games-puzzle/picpuz/files/picpuz-2.5-build.patch | 10 | ||||
| -rw-r--r-- | games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch index dfec57fe6ec0..6ca26e178bbf 100644 --- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch +++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch @@ -1,8 +1,8 @@ From: Julian Ospald <hasufell@gentoo.org> Date: Sat Jul 21 17:03:11 UTC 2012 ---- picpuz-2.5/Makefile -+++ picpuz-2.5/Makefile +--- a/Makefile ++++ b/Makefile @@ -11,24 +11,26 @@ # target install directories @@ -18,7 +18,7 @@ Date: Sat Jul 21 17:03:11 UTC 2012 MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` -+CXXFLAGS += -c `pkg-config --cflags gtk+-3.0` ++CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0` LIBS = `pkg-config --libs gtk+-3.0` $(PROGRAM): $(PROGRAM).o zfuncs.o @@ -46,8 +46,8 @@ Date: Sat Jul 21 17:03:11 UTC 2012 rm -R -f $(DESTDIR)$(DOCDIR) rm -f $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) ---- picpuz-2.5/zfuncs.cc -+++ picpuz-2.5/zfuncs.cc +--- a/zfuncs.cc ++++ b/zfuncs.cc @@ -3111,7 +3111,6 @@ /prefix/share/appname/locales/ translations: appname-de.po etc. /home/user/.appname/ parameters etc. are copied here diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch index 652231f1d4ff..f11f95cbf72b 100644 --- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch +++ b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch @@ -3,16 +3,14 @@ Fix underlinking on recent binutils: > x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz > /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5' > /lib64/libpthread.so.0: error adding symbols: DSO missing from command line -diff --git a/Makefile b/Makefile -index 28638de..700b610 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1 MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop - CXXFLAGS += -c `pkg-config --cflags gtk+-3.0` + CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0` -LIBS = `pkg-config --libs gtk+-3.0` -+LIBS = -pthread `pkg-config --libs gtk+-3.0` ++LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0` $(PROGRAM): $(PROGRAM).o zfuncs.o $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM) |