summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2005-01-21 02:39:23 +0000
committertv <tv@pkgsrc.org>2005-01-21 02:39:23 +0000
commitd42c89880e005ef026a45a0905ed980a984fef00 (patch)
treee07b310ac04de7ad3228b6806bd301c58c424f6a
parentf2e9270b55fde0bad8c655925b7d43a204c7d27f (diff)
downloadpkgsrc-d42c89880e005ef026a45a0905ed980a984fef00.tar.gz
Use PTHREAD_AUTO_VARS to get the correct compile options; fixes Interix.
-rw-r--r--archivers/pbzip2/Makefile3
-rw-r--r--archivers/pbzip2/distinfo4
-rw-r--r--archivers/pbzip2/patches/patch-aa6
3 files changed, 7 insertions, 6 deletions
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
index 1e62afda802..158f59a5237 100644
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/12 13:45:27 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/01/21 02:39:23 tv Exp $
#
DISTNAME= pbzip2-0.8.3
@@ -10,6 +10,7 @@ HOMEPAGE= http://compression.ca/pbzip2/
COMMENT= Parallel implementation of the bzip2 block-sorting file compressor
USE_BUILDLINK3= yes
+PTHREAD_AUTO_VARS= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pbzip2 ${PREFIX}/bin
diff --git a/archivers/pbzip2/distinfo b/archivers/pbzip2/distinfo
index de170bca5c6..03091d96d50 100644
--- a/archivers/pbzip2/distinfo
+++ b/archivers/pbzip2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/01/14 13:08:51 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/01/21 02:39:23 tv Exp $
SHA1 (pbzip2-0.8.3.tar.gz) = d1b9aaa822b196f572eeabf9f501957093cb3466
Size (pbzip2-0.8.3.tar.gz) = 13145 bytes
-SHA1 (patch-aa) = c937d872b3c35d6e162df7f61f6698e0e538a54b
+SHA1 (patch-aa) = fa47ae1bab608b8d92e6788fb077a4f4ad9283e5
diff --git a/archivers/pbzip2/patches/patch-aa b/archivers/pbzip2/patches/patch-aa
index 0ed4c7426c7..a1946bd6d36 100644
--- a/archivers/pbzip2/patches/patch-aa
+++ b/archivers/pbzip2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2005/01/14 13:08:51 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/01/21 02:39:23 tv Exp $
---- Makefile.orig 2005-01-09 19:58:48.000000000 +0100
+--- Makefile.orig 2005-01-09 13:58:48.000000000 -0500
+++ Makefile
@@ -1,10 +1,9 @@
# Make file for parallel BZIP2
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1 2005/01/14 13:08:51 wiz Exp $
pbzip2: pbzip2.cpp
- $(CC) -O3 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -pthread -lpthread -lbz2
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -pthread -lpthread -lbz2
++ $(LINK.cc) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -lbz2
pbzip2-static: libbz2.a pbzip2.cpp
$(CC) -O3 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o pbzip2 pbzip2.cpp -pthread -lpthread -L. -lbz2