summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordsainty <dsainty>2009-01-23 03:05:53 +0000
committerdsainty <dsainty>2009-01-23 03:05:53 +0000
commit3f8facf7ae6985c0c7e9e9e0ea61f8587520a7d7 (patch)
tree3c83443ad661d35da86be328e554aa60f0581e3e /lang
parent8e66a7782d7a13f7021b6faa5ffa58f84aedced9 (diff)
downloadpkgsrc-3f8facf7ae6985c0c7e9e9e0ea61f8587520a7d7.tar.gz
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 (limited to 'lang')
-rw-r--r--lang/python21/buildlink3.mk7
-rw-r--r--lang/python23/buildlink3.mk7
-rw-r--r--lang/python24/buildlink3.mk7
-rw-r--r--lang/python25/buildlink3.mk7
4 files changed, 24 insertions, 4 deletions
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index 745387dff18..aff4bb393d1 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -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_TRANSFORM+= l:python:python2.1
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 --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index 466378648a5..a20117d9183 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -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_TRANSFORM+= l:python:python2.3
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 --git a/lang/python24/buildlink3.mk b/lang/python24/buildlink3.mk
index 3d2687930cb..bd4e7e762fb 100644
--- a/lang/python24/buildlink3.mk
+++ b/lang/python24/buildlink3.mk
@@ -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_TRANSFORM+= l:python:python2.4
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 --git a/lang/python25/buildlink3.mk b/lang/python25/buildlink3.mk
index a5cebb37642..34c92fd4a6b 100644
--- a/lang/python25/buildlink3.mk
+++ b/lang/python25/buildlink3.mk
@@ -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 @@ BUILDLINK_TRANSFORM+= l:python:python2.5
.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"