summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-04-07 15:13:06 +0000
committerjmmv <jmmv>2004-04-07 15:13:06 +0000
commit3cbe8b67e1e595a6e060be2d70fc4c4353caa5b3 (patch)
tree3e4df045b9265968e490f2a419cd0abeca7ccc68
parent356afd1dbe2ff61fab727e3ba0e3596829949a07 (diff)
downloadpkgsrc-3cbe8b67e1e595a6e060be2d70fc4c4353caa5b3.tar.gz
When -lpthread is used, link the db3 library against it, so that programs
using -ldb3 alone don't complain about missing symbols. This fixes the build of some programs (like nvi), as exposed in Linux.
-rw-r--r--databases/db3/Makefile3
-rw-r--r--databases/db3/distinfo4
-rw-r--r--databases/db3/patches/patch-ab14
3 files changed, 15 insertions, 6 deletions
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 4c0def7ae6d..c12fceeaa57 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/07 15:13:06 jmmv Exp $
DISTNAME= db-3.3.11
PKGNAME= db3-3.11.2
@@ -35,4 +35,5 @@ CONFIGURE_ARGS+= --enable-compat185
post-install:
${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db3
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/db3/distinfo b/databases/db3/distinfo
index 85bb08cfba9..0a485b74a27 100644
--- a/databases/db3/distinfo
+++ b/databases/db3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/08/02 16:21:16 mrg Exp $
+$NetBSD: distinfo,v 1.11 2004/04/07 15:13:06 jmmv Exp $
SHA1 (db-3.3.11.tar.gz) = d6871c7e6008eb726d6fc28e3debc44d34570f93
Size (db-3.3.11.tar.gz) = 2343243 bytes
@@ -7,5 +7,5 @@ Size (patch.3.3.11.1) = 2601 bytes
SHA1 (patch.3.3.11.2) = e14879f28ba6d6bb8da9068c41d4ca8108352f80
Size (patch.3.3.11.2) = 325 bytes
SHA1 (patch-aa) = 772a047978c045fb6756b6ff4e5bb045d1e48382
-SHA1 (patch-ab) = dbd8f23e9b665777ce3ba4a9664cb83a65e88c6b
+SHA1 (patch-ab) = a2739c9dccc4564a34e71e6f830b609d057f0155
SHA1 (patch-ac) = 38b3eda1e70dbf6d27ae09affc4b570e4190788e
diff --git a/databases/db3/patches/patch-ab b/databases/db3/patches/patch-ab
index e1bb34af5b5..dbc71529a26 100644
--- a/databases/db3/patches/patch-ab
+++ b/databases/db3/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2001/11/30 11:58:28 martti Exp $
+$NetBSD: patch-ab,v 1.5 2004/04/07 15:13:06 jmmv Exp $
---- ../dist/configure.orig Thu Nov 29 03:04:02 2001
-+++ ../dist/configure Thu Nov 29 03:07:21 2001
+--- ../dist/configure.orig 2001-07-13 03:34:11.000000000 +0200
++++ ../dist/configure 2004-04-07 17:02:25.000000000 +0200
@@ -4329,6 +4329,7 @@
if test "$GXX" = "yes"; then
CXXVERSION=`${MAKEFILE_CXX} --version`
@@ -28,3 +28,11 @@ $NetBSD: patch-ab,v 1.4 2001/11/30 11:58:28 martti Exp $
INSTALLER="\$(LIBTOOL) --mode=install cp"
# Configure for shared libraries, static libraries, or both. If both are
+@@ -9165,6 +9166,7 @@
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread $LIBS"
++LIBSO_LIBS="-lpthread $LIBSO_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 9169 "configure"
+ #include "confdefs.h"