Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/picpuz/files: picpuz-2.1.1-build.patch
Date: Fri, 19 Feb 2010 09:09:09
Message-Id: E1NiOrC-0005aY-Oz@stork.gentoo.org
1 mr_bones_ 10/02/19 09:09:06
2
3 Added: picpuz-2.1.1-build.patch
4 Log:
5 version bump
6 (Portage version: 2.1.7.16/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-puzzle/picpuz/files/picpuz-2.1.1-build.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/picpuz/files/picpuz-2.1.1-build.patch?rev=1.1&content-type=text/plain
13
14 Index: picpuz-2.1.1-build.patch
15 ===================================================================
16 diff -ru picpuz-2.1.1.orig/Makefile picpuz-2.1.1/Makefile
17 --- picpuz-2.1.1.orig/Makefile 2010-02-01 08:19:04.000000000 -0500
18 +++ picpuz-2.1.1/Makefile 2010-02-19 03:36:42.343749782 -0500
19 @@ -4,9 +4,8 @@
20 VERSION = 2.1.1
21 SOURCE = $(PROGRAM)-$(VERSION).cpp
22
23 -# replace CFLAGS and LFLAGS -O3 with -g for GDB debugging
24 -CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
25 -LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0`
26 +CXXFLAGS += -O3 -Wall -c `pkg-config --cflags gtk+-2.0`
27 +LIBS = `pkg-config --libs gtk+-2.0` -lpthread
28
29 # use $PREFIX if defined, else assume /usr/local
30 ifeq "$(PREFIX)" ""
31 @@ -20,14 +19,14 @@
32 DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
33
34 $(PROGRAM): $(PROGRAM).o zfuncs.o
35 - @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o
36 + @ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(LIBS)
37
38 $(PROGRAM).o: $(SOURCE)
39 - @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \
40 + @ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
41 -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
42
43 zfuncs.o: zfuncs.cpp
44 - @ g++ $(CFLAGS) zfuncs.cpp \
45 + @ $(CXX) $(CXXFLAGS) zfuncs.cpp \
46 -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
47
48 install: $(PROGRAM)