[pkgsrc/trunk]: pkgsrc/lang Any package that determines libraries to link via:

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcf097be2c68
branches:  trunk
changeset: 553495:fcf097be2c68
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Fri Jan 23 03:05:53 2009 +0000

description:
Any package that determines libraries to link via:

  $PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SHLIBS');"

... where bdb.buildlink.mk has been used and it satisfied the requirement from
Pkgsrc (E.g. via databases/db4) would fail to build because the required -ldb4
library was not itself buildlinked.

To rectify this, pull in bdb.buildlink.mk in python??/buildlink3.mk under the
same conditions as it is pulled in in the package's own makefile.

No revision bump required, this almost certainly only affects packages and
environments that simply wouldn't build at all prior to the fix.

Fixes the build of py-ORBit on Linux (Python 2.4 or 2.5), and PR39377.

diffstat:

 lang/python21/buildlink3.mk |  7 ++++++-
 lang/python23/buildlink3.mk |  7 ++++++-
 lang/python24/buildlink3.mk |  7 ++++++-
 lang/python25/buildlink3.mk |  7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diffs (83 lines):

diff -r bc7d26081ae2 -r fcf097be2c68 lang/python21/buildlink3.mk
--- a/lang/python21/buildlink3.mk       Fri Jan 23 00:05:03 2009 +0000
+++ b/lang/python21/buildlink3.mk       Fri Jan 23 03:05:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/01/23 03:05:53 dsainty Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PYTHON21_BUILDLINK3_MK:=       ${PYTHON21_BUILDLINK3_MK}+
@@ -27,5 +27,10 @@
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "SunOS" && ${OPSYS} != "IRIX"
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r bc7d26081ae2 -r fcf097be2c68 lang/python23/buildlink3.mk
--- a/lang/python23/buildlink3.mk       Fri Jan 23 00:05:03 2009 +0000
+++ b/lang/python23/buildlink3.mk       Fri Jan 23 03:05:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/01/23 03:05:53 dsainty Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PYTHON23_BUILDLINK3_MK:=       ${PYTHON23_BUILDLINK3_MK}+
@@ -28,6 +28,11 @@
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "IRIX"
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r bc7d26081ae2 -r fcf097be2c68 lang/python24/buildlink3.mk
--- a/lang/python24/buildlink3.mk       Fri Jan 23 00:05:03 2009 +0000
+++ b/lang/python24/buildlink3.mk       Fri Jan 23 03:05:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/01/23 03:05:53 dsainty Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PYTHON24_BUILDLINK3_MK:=       ${PYTHON24_BUILDLINK3_MK}+
@@ -28,6 +28,11 @@
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "IRIX"
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r bc7d26081ae2 -r fcf097be2c68 lang/python25/buildlink3.mk
--- a/lang/python25/buildlink3.mk       Fri Jan 23 00:05:03 2009 +0000
+++ b/lang/python25/buildlink3.mk       Fri Jan 23 03:05:53 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/04/24 01:50:58 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/01/23 03:05:53 dsainty Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 PYTHON25_BUILDLINK3_MK:=       ${PYTHON25_BUILDLINK3_MK}+
@@ -26,6 +26,11 @@
 
 .endif # PYTHON25_BUILDLINK3_MK
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "IRIX"
+.  include "../../mk/bdb.buildlink3.mk"
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"