| 1 |
ssuominen 10/07/26 14:01:34 |
| 2 |
|
| 3 |
Modified: fotoxx-makefile.patch |
| 4 |
Log: |
| 5 |
Fix building with -Wl,--as-needed wrt #329901 by Nao Nakashima. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 media-gfx/fotoxx/files/fotoxx-makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-makefile.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-makefile.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-makefile.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: fotoxx-makefile.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/files/fotoxx-makefile.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- fotoxx-makefile.patch 20 Jul 2010 03:57:01 -0000 1.2 |
| 22 |
+++ fotoxx-makefile.patch 26 Jul 2010 14:01:34 -0000 1.3 |
| 23 |
@@ -1,10 +1,43 @@ |
| 24 |
-diff -U2 -r fotoxx-10.7.orig//Makefile fotoxx-10.7//Makefile |
| 25 |
---- fotoxx-10.7.orig//Makefile 2010-07-07 23:31:04.000000000 +0700 |
| 26 |
-+++ fotoxx-10.7//Makefile 2010-07-16 19:06:59.000000000 +0700 |
| 27 |
-@@ -17,5 +17,5 @@ |
| 28 |
+http://bugs.gentoo.org/329901 and misc fixes |
| 29 |
+ |
| 30 |
+--- Makefile |
| 31 |
++++ Makefile |
| 32 |
+@@ -5,30 +5,30 @@ |
| 33 |
+ SOURCE = $(PROGRAM)-$(VERSION).cc |
| 34 |
+ |
| 35 |
+ # defaults for parameters that may be pre-defined |
| 36 |
+-CXXFLAGS ?= -O3 -g -Wall |
| 37 |
+-LDFLAGS ?= -O3 -g -Wall -rdynamic |
| 38 |
++CXXFLAGS += -Wall |
| 39 |
++LDFLAGS += -rdynamic |
| 40 |
+ PREFIX ?= /usr/local |
| 41 |
+ |
| 42 |
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` |
| 43 |
+-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0` |
| 44 |
++CXXFLAGS += -c `pkg-config --cflags gtk+-2.0` |
| 45 |
++LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` |
| 46 |
+ |
| 47 |
+ BINDIR = $(PREFIX)/bin |
| 48 |
+ DATADIR = $(PREFIX)/share/$(PROGRAM) |
| 49 |
ICONDIR = $(DATADIR)/icons |
| 50 |
DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop |
| 51 |
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) |
| 52 |
+DOCDIR = $(PREFIX)/share/doc/$(PF) |
| 53 |
MANDIR = $(PREFIX)/share/man/man1 |
| 54 |
|
| 55 |
+ $(PROGRAM): $(PROGRAM).o zfuncs.o |
| 56 |
+ @ ./dependencies.sh |
| 57 |
+- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o |
| 58 |
++ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS) |
| 59 |
+ |
| 60 |
+ $(PROGRAM).o: $(SOURCE) |
| 61 |
+- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
| 62 |
++ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
| 63 |
+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" |
| 64 |
+ |
| 65 |
+ zfuncs.o: zfuncs.cc |
| 66 |
+- $(CXX) $(CFLAGS) zfuncs.cc \ |
| 67 |
++ $(CXX) $(CXXFLAGS) zfuncs.cc \ |
| 68 |
+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" |
| 69 |
+ |
| 70 |
+ install: $(PROGRAM) |
Archives