summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-02-18 01:00:54 +0000
committerMike Frysinger <vapier@gentoo.org>2013-02-18 01:00:54 +0000
commited4679f4b9962614e09e5723d4643b735096b2e9 (patch)
treea3d2922350fdf837015448609173ab0d478088d4 /app-arch/pixz
parentAdd ~arm-linux keyword. (diff)
downloadgentoo-2-ed4679f4b9962614e09e5723d4643b735096b2e9.tar.gz
gentoo-2-ed4679f4b9962614e09e5723d4643b735096b2e9.tar.bz2
gentoo-2-ed4679f4b9962614e09e5723d4643b735096b2e9.zip
Add missing -lm to linking.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'app-arch/pixz')
-rw-r--r--app-arch/pixz/ChangeLog6
-rw-r--r--app-arch/pixz/files/pixz-1.0.2-lm.patch25
-rw-r--r--app-arch/pixz/pixz-1.0.2.ebuild8
3 files changed, 36 insertions, 3 deletions
diff --git a/app-arch/pixz/ChangeLog b/app-arch/pixz/ChangeLog
index 71e79acb1f37..61d06225a4ad 100644
--- a/app-arch/pixz/ChangeLog
+++ b/app-arch/pixz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/pixz
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/ChangeLog,v 1.5 2013/01/11 01:55:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/ChangeLog,v 1.6 2013/02/18 01:00:53 vapier Exp $
+
+ 18 Feb 2013; Mike Frysinger <vapier@gentoo.org> +files/pixz-1.0.2-lm.patch,
+ pixz-1.0.2.ebuild:
+ Add missing -lm to linking.
11 Jan 2013; Rick Farina <zerochaos@gentoo.org> pixz-1.0.2.ebuild,
pixz-9999.ebuild:
diff --git a/app-arch/pixz/files/pixz-1.0.2-lm.patch b/app-arch/pixz/files/pixz-1.0.2-lm.patch
new file mode 100644
index 000000000000..7db039a54a95
--- /dev/null
+++ b/app-arch/pixz/files/pixz-1.0.2-lm.patch
@@ -0,0 +1,25 @@
+From 6c9d6b9020c599f850c0b719cc9c041f1667671b Mon Sep 17 00:00:00 2001
+From: Dave Vasilevsky <dave@vasilevsky.ca>
+Date: Thu, 10 Jan 2013 08:28:06 -0500
+Subject: [PATCH] Fix linking bug (issue 11)
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index fe605f2..3b27690 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@ MYCFLAGS = $(patsubst %,-I%/include,$(LIBPREFIX)) $(OPT) -std=gnu99 \
+ MYLDFLAGS = $(patsubst %,-L%/lib,$(LIBPREFIX)) $(OPT) -Wall
+
+ THREADS = -lpthread
+-LIBADD = $(THREADS) -llzma -larchive
++LIBADD = $(THREADS) -lm -llzma -larchive
+
+ CC = gcc
+ COMPILE = $(CC) $(MYCFLAGS) $(CFLAGS) -c -o
+--
+1.8.1.2
+
diff --git a/app-arch/pixz/pixz-1.0.2.ebuild b/app-arch/pixz/pixz-1.0.2.ebuild
index 24735bec5356..a59449e81f92 100644
--- a/app-arch/pixz/pixz-1.0.2.ebuild
+++ b/app-arch/pixz/pixz-1.0.2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.2 2013/01/11 01:55:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.3 2013/02/18 01:00:53 vapier Exp $
EAPI=4
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic eutils
DESCRIPTION="Parallel Indexed XZ compressor"
HOMEPAGE="https://github.com/vasi/pixz"
@@ -28,6 +28,10 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-lm.patch
+}
+
src_configure() {
use static && append-ldflags -static
}