summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-02 22:47:44 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-02 22:47:44 +0000
commit0b73d43a35061502882766da86509b9e55ea32f0 (patch)
treec5e908ed984186ac87b0772c2bc841d9cf1791f6 /media-libs/netpbm
parentMark 2.12.1 stable on alpha (diff)
downloadgentoo-2-0b73d43a35061502882766da86509b9e55ea32f0.tar.gz
gentoo-2-0b73d43a35061502882766da86509b9e55ea32f0.tar.bz2
gentoo-2-0b73d43a35061502882766da86509b9e55ea32f0.zip
Make sure we link against libm #121253 by Diego Pettenò.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r--media-libs/netpbm/ChangeLog6
-rw-r--r--media-libs/netpbm/files/netpbm-10.31-need-libm.patch16
-rw-r--r--media-libs/netpbm/netpbm-10.31-r1.ebuild3
3 files changed, 23 insertions, 2 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 713b98622c7b..da24ebb76872 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/netpbm
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.102 2006/01/19 21:01:14 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.103 2006/02/02 22:47:44 vapier Exp $
+
+ 02 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/netpbm-10.31-need-libm.patch, netpbm-10.31-r1.ebuild:
+ Make sure we link against libm #121253 by Diego Pettenò.
19 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+files/netpbm-10.31-parallel.patch, netpbm-10.31-r1.ebuild:
diff --git a/media-libs/netpbm/files/netpbm-10.31-need-libm.patch b/media-libs/netpbm/files/netpbm-10.31-need-libm.patch
new file mode 100644
index 000000000000..a241ad2bdb0d
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.31-need-libm.patch
@@ -0,0 +1,16 @@
+libnetpbm.so uses libm functions so we need to link with libm
+
+patch by Diego Pettenò
+http://bugs.gentoo.org/121253
+
+--- netpbm-10.31/lib/Makefile
++++ netpbm-10.31/lib/Makefile
+@@ -115,7 +115,7 @@
+ $(SYMLINK) $< $@
+ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
+ $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
+- $(SHLIB_CLIB) $(LADD)
++ $(SHLIB_CLIB) $(LADD) -lm
+ endif
+
+ ifeq ($(NETPBMLIBTYPE),dll)
diff --git a/media-libs/netpbm/netpbm-10.31-r1.ebuild b/media-libs/netpbm/netpbm-10.31-r1.ebuild
index 5d996f61a759..59f9b7ed25d7 100644
--- a/media-libs/netpbm/netpbm-10.31-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.31-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.3 2006/01/19 21:01:14 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.31-r1.ebuild,v 1.4 2006/02/02 22:47:44 vapier Exp $
inherit flag-o-matic toolchain-funcs eutils multilib
@@ -52,6 +52,7 @@ src_unpack() {
epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
epatch "${FILESDIR}"/netpbm-10.31-pnmtopng-modtime-segfault.patch #117180
epatch "${FILESDIR}"/netpbm-10.19-message.patch #Fedora
+ epatch "${FILESDIR}"/netpbm-10.31-need-libm.patch #121253
epatch ${FILESDIR}/${P}-parallel.patch
rm -f configure