pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/db3 When -lpthread is used, link the db3 lib...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e9d2bed6d2c9
branches:  trunk
changeset: 472284:e9d2bed6d2c9
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Apr 07 15:13:06 2004 +0000

description:
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.

diffstat:

 databases/db3/Makefile         |   3 ++-
 databases/db3/distinfo         |   4 ++--
 databases/db3/patches/patch-ab |  14 +++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r b2f398132a1b -r e9d2bed6d2c9 databases/db3/Makefile
--- a/databases/db3/Makefile    Wed Apr 07 15:12:40 2004 +0000
+++ b/databases/db3/Makefile    Wed Apr 07 15:13:06 2004 +0000
@@ -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 @@
 post-install:
        ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db3
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b2f398132a1b -r e9d2bed6d2c9 databases/db3/distinfo
--- a/databases/db3/distinfo    Wed Apr 07 15:12:40 2004 +0000
+++ b/databases/db3/distinfo    Wed Apr 07 15:13:06 2004 +0000
@@ -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 @@
 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 -r b2f398132a1b -r e9d2bed6d2c9 databases/db3/patches/patch-ab
--- a/databases/db3/patches/patch-ab    Wed Apr 07 15:12:40 2004 +0000
+++ b/databases/db3/patches/patch-ab    Wed Apr 07 15:13:06 2004 +0000
@@ -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 @@
  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"



Home | Main Index | Thread Index | Old Index