diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-07-21 18:22:32 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-07-21 18:22:32 +0000 |
| commit | 960c9fc12388190ca3364118630c3a8723ebe405 (patch) | |
| tree | 9fe3d28f3b4d90f875b7682fc3fa86adcf6176ea /games-puzzle/picpuz | |
| parent | Fix issue with LDFLAGS (bug #426492), CFLAGS, and CXXFLAGS. Fix EPREFIX usage... (diff) | |
| download | gentoo-2-960c9fc12388190ca3364118630c3a8723ebe405.tar.gz gentoo-2-960c9fc12388190ca3364118630c3a8723ebe405.tar.bz2 gentoo-2-960c9fc12388190ca3364118630c3a8723ebe405.zip | |
fix bug 427520
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'games-puzzle/picpuz')
| -rw-r--r-- | games-puzzle/picpuz/ChangeLog | 5 | ||||
| -rw-r--r-- | games-puzzle/picpuz/files/picpuz-2.1.1-build.patch | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog index 8058ce333c25..87a3f4c2184d 100644 --- a/games-puzzle/picpuz/ChangeLog +++ b/games-puzzle/picpuz/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-puzzle/picpuz # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.12 2012/05/04 04:45:27 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.13 2012/07/21 18:22:32 hasufell Exp $ + + 21 Jul 2012; Julian Ospald <hasufell@gentoo.org> ChangeLog: + fix bug 427520 04 May 2012; Jeff Horelick <jdhore@gentoo.org> picpuz-2.1.1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch b/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch index 252a912c7d8e..3c797b1f4854 100644 --- a/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch +++ b/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch @@ -8,8 +8,8 @@ diff -ru picpuz-2.1.1.orig/Makefile picpuz-2.1.1/Makefile -# replace CFLAGS and LFLAGS -O3 with -g for GDB debugging -CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0` -LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0` -+CXXFLAGS += -O3 -Wall -c `pkg-config --cflags gtk+-2.0` -+LIBS = `pkg-config --libs gtk+-2.0` -lpthread ++CXXFLAGS += `pkg-config --cflags gtk+-2.0` ++LIBS = `pkg-config --libs gtk+-2.0` # use $PREFIX if defined, else assume /usr/local ifeq "$(PREFIX)" "" @@ -18,16 +18,16 @@ diff -ru picpuz-2.1.1.orig/Makefile picpuz-2.1.1/Makefile $(PROGRAM): $(PROGRAM).o zfuncs.o - @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -+ @ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(LIBS) ++ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(LIBS) $(PROGRAM).o: $(SOURCE) - @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ -+ @ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \ ++ $(CXX) $(CXXFLAGS) -c -o $(PROGRAM).o $(SOURCE) \ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" zfuncs.o: zfuncs.cpp - @ g++ $(CFLAGS) zfuncs.cpp \ -+ @ $(CXX) $(CXXFLAGS) zfuncs.cpp \ ++ $(CXX) $(CXXFLAGS) -c zfuncs.cpp \ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" install: $(PROGRAM) |