summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2016-03-10 18:42:25 +0000
committerjperkin <jperkin@pkgsrc.org>2016-03-10 18:42:25 +0000
commit8654beae4bb5473b9053379469215cff94b18cf2 (patch)
tree14e488ab9ca6eaed990a7b2c15810290847486c7
parent08b90c9e6677678444c85577c8865f551e3d8660 (diff)
downloadpkgsrc-8654beae4bb5473b9053379469215cff94b18cf2.tar.gz
Ensure we append to LDFLAGS, fixes rpath issues that were only exposed after
fixing check-shlibs. Bump PKGREVISION.
-rw-r--r--archivers/lzmalib/Makefile3
-rw-r--r--archivers/lzmalib/distinfo4
-rw-r--r--archivers/lzmalib/patches/patch-aa11
3 files changed, 14 insertions, 4 deletions
diff --git a/archivers/lzmalib/Makefile b/archivers/lzmalib/Makefile
index c672e8cc463..01290bca922 100644
--- a/archivers/lzmalib/Makefile
+++ b/archivers/lzmalib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2015/03/15 17:30:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.6 2016/03/10 18:42:25 jperkin Exp $
#
DISTNAME= lzmalib-0.0.1
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= http://tokyocabinet.sourceforge.net/misc/
diff --git a/archivers/lzmalib/distinfo b/archivers/lzmalib/distinfo
index cdc676f9b02..961c27fe969 100644
--- a/archivers/lzmalib/distinfo
+++ b/archivers/lzmalib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 00:56:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/03/10 18:42:25 jperkin Exp $
SHA1 (lzmalib-0.0.1.tar.gz) = 638e511d1c6c5018f071b0f145bdfb242c34b6ce
RMD160 (lzmalib-0.0.1.tar.gz) = caad5a009f3247ee1d0ee1500b90db5469ce1bd4
SHA512 (lzmalib-0.0.1.tar.gz) = 22eaa1ce1f365438f09283a556efffa973d75215fae4056657c843d0008863a38fe2cc5d7ec3be797c731700b20df0c22a8e464256483aee199229c13db736ef
Size (lzmalib-0.0.1.tar.gz) = 112202 bytes
-SHA1 (patch-aa) = 475d43320384887faf6d14c13d2f7b941327299e
+SHA1 (patch-aa) = 857039dbf8089c764f4a68838fd1bfdb69242922
SHA1 (patch-ab) = dd8fcbce7a0a2ace551b8f84ab3b866e11b2742d
SHA1 (patch-ac) = 46b577410eb57cb0a17961f87006248ec0e08653
diff --git a/archivers/lzmalib/patches/patch-aa b/archivers/lzmalib/patches/patch-aa
index a9f3bf4cdda..ca7e71bcf5a 100644
--- a/archivers/lzmalib/patches/patch-aa
+++ b/archivers/lzmalib/patches/patch-aa
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/04 12:07:15 obache Exp $
+$NetBSD: patch-aa,v 1.2 2016/03/10 18:42:25 jperkin Exp $
Link with c++ instead of cc -lstdc++ to depended package easy to link.
--- Makefile.in.orig 2008-07-23 08:40:09.000000000 +0000
+++ Makefile.in
+@@ -38,7 +38,7 @@ CXX = @CXX@
+ CPPFLAGS = @MYCPPFLAGS@
+ CFLAGS = @MYCFLAGS@
+ CXXFLAGS = @MYCXXFLAGS@
+-LDFLAGS = @MYLDFLAGS@
++LDFLAGS += @MYLDFLAGS@
+ LIBS = @LIBS@
+ LDENV = LD_RUN_PATH=$(LIBDIR):.
+ VPATH = @MYVPATH@
@@ -125,7 +125,7 @@ liblzma.a : $(LIBOBJFILES)