summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-01-16 15:50:18 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-01-16 15:50:18 +0000
commit62d15792963ff6f45045c5d0407308e16df7d425 (patch)
tree8f3619131abe4a9390b163e5903c028832da2a92 /app-text
parentFixed issues when compiling with --as-needed. Closes bug #248615. (diff)
downloadgentoo-2-62d15792963ff6f45045c5d0407308e16df7d425.tar.gz
gentoo-2-62d15792963ff6f45045c5d0407308e16df7d425.tar.bz2
gentoo-2-62d15792963ff6f45045c5d0407308e16df7d425.zip
Fix as-needed, bug 247003.
(Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/xpdf/ChangeLog8
-rw-r--r--app-text/xpdf/files/xpdf-3.02-as-needed.patch11
-rw-r--r--app-text/xpdf/xpdf-3.02-r1.ebuild5
3 files changed, 20 insertions, 4 deletions
diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index d471e0959b2a..8fb7fcd2d6ab 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/xpdf
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.170 2008/10/14 21:12:27 loki_val Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.171 2009/01/16 15:50:18 loki_val Exp $
+
+ 16 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+ +files/xpdf-3.02-as-needed.patch, xpdf-3.02-r1.ebuild:
+ Fix as-needed, bug 247003.
14 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
-files/poppler-0.5.9.patch, +files/poppler-0.10.0.patch,
diff --git a/app-text/xpdf/files/xpdf-3.02-as-needed.patch b/app-text/xpdf/files/xpdf-3.02-as-needed.patch
new file mode 100644
index 000000000000..d5c1106c4074
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.02-as-needed.patch
@@ -0,0 +1,11 @@
+--- a/Makefile 2009-01-01 12:11:09.000000000 -0600
++++ b/Makefile 2009-01-01 12:11:14.000000000 -0600
+@@ -5,7 +5,7 @@
+ CPPFLAGS+= $(INCLUDES) -DHAVE_DIRENT_H
+
+ xpdf: CoreOutputDev.o GlobalParams.o ImageOutputDev.o PDFCore.o XPDFApp.o XPDFCore.o XPDFTree.o XPDFViewer.o parseargs.o xpdf.o
+- $(CXX) -o xpdf $(LIBS) *.o
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xpdf *.o $(LIBS)
+
+ clean:
+ rm -f *.o xpdf
diff --git a/app-text/xpdf/xpdf-3.02-r1.ebuild b/app-text/xpdf/xpdf-3.02-r1.ebuild
index f7b0cda0b6ab..a50164ebd803 100644
--- a/app-text/xpdf/xpdf-3.02-r1.ebuild
+++ b/app-text/xpdf/xpdf-3.02-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r1.ebuild,v 1.5 2008/10/14 21:12:27 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r1.ebuild,v 1.6 2009/01/16 15:50:18 loki_val Exp $
inherit eutils flag-o-matic
@@ -41,6 +41,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
has_version '>=app-text/poppler-0.10.0' && \
epatch "${FILESDIR}"/poppler-0.10.0.patch
+ epatch "${FILESDIR}/${P}-as-needed.patch"
}
src_install() {