Archives
Archives
| From: | "Michael Weber (xmw)" <xmw@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-text/pdftk/files: pdftk-1.44-LDFLAGS.patch pdftk-1.44-Makefile.patch |
| Date: | Sat, 27 Nov 2010 22:17:04 |
| Message-Id: | 20101127221640.2888820054@flycatcher.gentoo.org |
| 1 | xmw 10/11/27 22:16:40 |
| 2 | |
| 3 | Added: pdftk-1.44-LDFLAGS.patch pdftk-1.44-Makefile.patch |
| 4 | Log: |
| 5 | Revision bump to fix gcc:4.5 problems (bug 339345). |
| 6 | |
| 7 | (Portage version: 2.1.9.24/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: pdftk-1.44-LDFLAGS.patch |
| 16 | =================================================================== |
| 17 | --- pdftk-1.44-dist/pdftk/Makefile.Base |
| 18 | +++ pdftk-1.44-dist/pdftk/Makefile.Base |
| 19 | @@ -44,7 +44,7 @@ |
| 20 | $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c |
| 21 | |
| 22 | pdftk : pdftk.o attachments.o report.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) |
| 23 | - $(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk |
| 24 | + $(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) $(LDFLAGS) -o pdftk |
| 25 | |
| 26 | install: |
| 27 | /usr/bin/install pdftk /usr/local/bin |
| 28 | |
| 29 | |
| 30 | |
| 31 | 1.1 app-text/pdftk/files/pdftk-1.44-Makefile.patch |
| 32 | |
| 33 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pdftk/files/pdftk-1.44-Makefile.patch?rev=1.1&view=markup |
| 34 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pdftk/files/pdftk-1.44-Makefile.patch?rev=1.1&content-type=text/plain |
| 35 | |
| 36 | Index: pdftk-1.44-Makefile.patch |
| 37 | =================================================================== |
| 38 | --- pdftk-1.44-dist/pdftk/Makefile.Debian |
| 39 | +++ pdftk-1.44-dist/pdftk/Makefile.Debian |
| 40 | @@ -29,12 +29,11 @@ |
| 41 | # tools |
| 42 | # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME) |
| 43 | TOOLPATH= |
| 44 | -export VERSUFF=-4.4 |
| 45 | -export CXX= $(TOOLPATH)g++$(VERSUFF) |
| 46 | -export GCJ= $(TOOLPATH)gcj$(VERSUFF) |
| 47 | -export GCJH= $(TOOLPATH)gcjh$(VERSUFF) |
| 48 | -export GJAR= $(TOOLPATH)gjar$(VERSUFF) |
| 49 | -export LIBGCJ= /usr/share/java/libgcj$(VERSUFF).jar |
| 50 | +export VERSUFF= |
| 51 | +export CXX= $(TOOLPATH)g++ |
| 52 | +export GCJ= $(TOOLPATH)gcj |
| 53 | +export GCJH= $(TOOLPATH)gcjh |
| 54 | +export GJAR= $(TOOLPATH)gjar |
| 55 | export AR= ar |
| 56 | export RM= rm |
| 57 | export ARFLAGS= rs |
| 58 | @@ -73,7 +72,7 @@ |
| 59 | # |
| 60 | export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers |
| 61 | export CXXFLAGS= -Wall -Wextra -Weffc++ -O2 |
| 62 | -export GCJFLAGS= -Wall -Wextra -fsource=1.3 -O2 |
| 63 | +export GCJFLAGS= -Wall -fsource=1.3 -O2 |
| 64 | export GCJHFLAGS= -force |
| 65 | export LDLIBS= -lgcj |