Use the pkgsrc-installed libtool, not the throwaway in-tree libtool, to

choose between link commands for shared or static linking.

Should fix shlib build and install on Interix.

3 files changed, 19 insertions, 8 deletions

diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index a30e85d5cf7..84d396e9bd1 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/25 06:26:48 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/04 18:47:52 tv Exp $
 
 DISTNAME=		db-4.3.29
 PKGNAME=		${DISTNAME:S/db/db4/}
@@ -21,7 +21,6 @@ CONFIGURE_SCRIPT=	../dist/configure
 
 CONFIGURE_ARGS+=	--enable-cxx
 CONFIGURE_ARGS+=	--enable-rpc
-CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-compat185
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/db4
 CONFIGURE_ARGS+=	--program-transform-name=s,db_,db4_,
@@ -30,6 +29,10 @@ CONFIGURE_ARGS+=	--program-transform-name=s,db_,db4_,
 # needed for this package the following does no harm on other platform.
 CONFIGURE_ENV+=		F77=${FALSE}
 
+# Along with a hack in patch-ab, this forces shlib detection via
+# the pkgsrc-supplied libtool only.
+CONFIGURE_ENV+=		LIBTOOL_PROG="${LIBTOOL} ${LIBTOOL_FLAGS}"
+
 OPSYSVARS+=		LIBSO_LIBS
 LIBSO_LIBS.Interix+=	-lrpclib
 LIBS.Interix+=		-lrpclib # needed for in-tree programs, too
diff --git a/databases/db4/distinfo b/databases/db4/distinfo
index 9bb6bcd0663..fed6f100a4d 100644
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2005/10/25 06:26:48 jlam Exp $
+$NetBSD: distinfo,v 1.19 2005/11/04 18:47:52 tv Exp $
 
 SHA1 (db-4.3.29.tar.gz) = 7ddac51fcbd5945aed154be2ee1fe166b3acd628
 RMD160 (db-4.3.29.tar.gz) = fac910828a74087124e9cc3cad99c6a6dc88c14b
 Size (db-4.3.29.tar.gz) = 6103264 bytes
 SHA1 (patch-aa) = 0ab7730d6eb4e1a93c9ca4dcf15f2b28c794d972
-SHA1 (patch-ab) = 0fe5e630222429b8bf767e2e15aa5ea51a0f2eb5
+SHA1 (patch-ab) = a713cf41d214f692d25a5031eb71d05f268eca1f
 SHA1 (patch-ac) = d31cb82810577003de202ac81e91aa15108147c7
 SHA1 (patch-ad) = a0c92d70ef752f02011ef6b5d76d1fb7cabf8895
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 9600b94597e..a13acd0fb8b 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.11 2005/10/25 06:26:48 jlam Exp $
+$NetBSD: patch-ab,v 1.12 2005/11/04 18:47:52 tv Exp $
 
 --- dist/configure.orig	2005-09-06 03:44:24.000000000 -0400
 +++ dist/configure
@@ -98,7 +98,15 @@ $NetBSD: patch-ab,v 1.11 2005/10/25 06:26:48 jlam Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -20866,7 +20867,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
+@@ -20774,7 +20775,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 
+ 
+ SOFLAGS="-rpath \$(libdir)"
+-LIBTOOL_PROG="${SHELL} ./libtool"
+ 
+ # Set SOSUFFIX and friends
+ 
+@@ -20866,7 +20866,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -107,7 +115,7 @@ $NetBSD: patch-ab,v 1.11 2005/10/25 06:26:48 jlam Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -21614,7 +21615,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -21614,7 +21614,7 @@ if test "$_JTOPDIR" != "/usr"; then
  	case "$host_os" in
  	aix*)		_JNI_INC_SUBDIRS="aix";;
  	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
@@ -116,7 +124,7 @@ $NetBSD: patch-ab,v 1.11 2005/10/25 06:26:48 jlam Exp $
  	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
  	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
  	osf*)		_JNI_INC_SUBDIRS="alpha";;
-@@ -30025,7 +30026,7 @@ fi
+@@ -30025,7 +30025,7 @@ fi
  #
  # If the user specified we use POSIX pthreads mutexes, and we fail to find the
  # full interface, try and configure for just intra-process support.