Create BUILDLINK_CPPFLAGS and BUILDLINK_LDFLAGS for the python packages so

as to find their headers and libraries.  Also allow "-lpython" to resolve
to the versioned libpython (-lpython2.2, etc.).

5 files changed, 42 insertions, 5 deletions

diff --git a/lang/python15/buildlink2.mk b/lang/python15/buildlink2.mk
index 870593ea9f3..a26994471cc 100644
--- a/lang/python15/buildlink2.mk
+++ b/lang/python15/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/20 22:44:18 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:40 jlam Exp $
 
 .if !defined(PYTHON15_BUILDLINK2_MK)
 PYTHON15_BUILDLINK2_MK=	# defined
@@ -18,6 +18,13 @@ BUILDLINK_PREFIX.python15_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.python15!= \
 	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python15}/PLIST
 BUILDLINK_FILES.python15+=	lib/python1.5/config/libpython1.5.*
+BUILDLINK_TRANSFORM+=		l:python:python1.5
+
+BUILDLINK_CPPFLAGS.python15+= \
+	-I${BUILDLINK_PREFIX.python15}/include/python1.5
+BUILDLINK_LDFLAGS.python15+= \
+	-L${BUILDLINK_PREFIX.python15}/lib/python1.5/config		\
+	-Wl,-R${BUILDLINK_PREFIX.python15}/lib/python1.5/config
 
 BUILDLINK_TARGETS+=	python15-buildlink
 
diff --git a/lang/python20/buildlink2.mk b/lang/python20/buildlink2.mk
index c58d9fcb511..8188cebb0d9 100644
--- a/lang/python20/buildlink2.mk
+++ b/lang/python20/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/20 22:44:19 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:40 jlam Exp $
 
 .if !defined(PYTHON20_BUILDLINK2_MK)
 PYTHON20_BUILDLINK2_MK=	# defined
@@ -18,6 +18,13 @@ BUILDLINK_PREFIX.python20_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.python20!= \
 	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python20}/PLIST
 BUILDLINK_FILES.python20+=	lib/python2.0/config/libpython2.0.*
+BUILDLINK_TRANSFORM+=		l:python:python2.0
+
+BUILDLINK_CPPFLAGS.python20+= \
+	-I${BUILDLINK_PREFIX.python20}/include/python2.0
+BUILDLINK_LDFLAGS.python20+= \
+	-L${BUILDLINK_PREFIX.python20}/lib/python2.0/config		\
+	-Wl,-R${BUILDLINK_PREFIX.python20}/lib/python2.0/config
 
 BUILDLINK_TARGETS+=	python20-buildlink
 
diff --git a/lang/python21-pth/buildlink2.mk b/lang/python21-pth/buildlink2.mk
index fdaa35ab909..920fbc361fe 100644
--- a/lang/python21-pth/buildlink2.mk
+++ b/lang/python21-pth/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/20 22:44:19 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:41 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -18,6 +18,13 @@ BUILDLINK_PREFIX.python21-pth_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.python21-pth!= \
 	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python21-pth}/PLIST
 BUILDLINK_FILES.python21-pth+=	lib/python2p1/config/libpython2p1.*
+BUILDLINK_TRANSFORM+=		l:python:python2p1
+
+BUILDLINK_CPPFLAGS.python21-pth+= \
+	-I${BUILDLINK_PREFIX.python21-pth}/include/python2p1
+BUILDLINK_LDFLAGS.python21-pth+= \
+	-L${BUILDLINK_PREFIX.python21-pth}/lib/python2p1/config		\
+	-Wl,-R${BUILDLINK_PREFIX.python21-pth}/lib/python2p1/config
 
 BUILDLINK_TARGETS+=	python21-pth-buildlink
 
diff --git a/lang/python21/buildlink2.mk b/lang/python21/buildlink2.mk
index d3ccb59c269..e18c85798af 100644
--- a/lang/python21/buildlink2.mk
+++ b/lang/python21/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/09/20 22:44:20 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 11:40:41 jlam Exp $
 
 .if !defined(PYTHON21_BUILDLINK2_MK)
 PYTHON21_BUILDLINK2_MK=	# defined
@@ -18,6 +18,13 @@ BUILDLINK_PREFIX.python21_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.python21!= \
 	${GREP} "^include/" ${.CURDIR}/${BUILDLINK_PKGSRCDIR.python21}/PLIST
 BUILDLINK_FILES.python21+=	lib/python2.1/config/libpython2.1.*
+BUILDLINK_TRANSFORM+=		l:python:python2.1
+
+BUILDLINK_CPPFLAGS.python21+= \
+	-I${BUILDLINK_PREFIX.python21}/include/python2.1
+BUILDLINK_LDFLAGS.python21+= \
+	-L${BUILDLINK_PREFIX.python21}/lib/python2.1/config		\
+	-Wl,-R${BUILDLINK_PREFIX.python21}/lib/python2.1/config
 
 BUILDLINK_TARGETS+=	python21-buildlink
 
diff --git a/lang/python22/buildlink2.mk b/lang/python22/buildlink2.mk
index f432e4c0866..d7949a78b99 100644
--- a/lang/python22/buildlink2.mk
+++ b/lang/python22/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 10:55:06 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/10/09 11:40:41 jlam Exp $
 
 .if !defined(PYTHON22_BUILDLINK2_MK)
 PYTHON22_BUILDLINK2_MK=	# defined
@@ -20,6 +20,15 @@ _PY22_PLIST+=	${.CURDIR}/${BUILDLINK_PKGSRCDIR.python22}/PLIST.${LOWER_OPSYS}
 _PY22_PLIST+=	${.CURDIR}/${BUILDLINK_PKGSRCDIR.python22}/PLIST.common_end
 BUILDLINK_FILES.python22!=	${CAT} ${_PY22_PLIST} | ${GREP} "^include/"
 BUILDLINK_FILES.python22+=	lib/python2.2/config/libpython2.2.*
+BUILDLINK_TRANSFORM+=		l:python:python2.2
+
+BUILDLINK_CPPFLAGS.python22+= \
+	-I${BUILDLINK_PREFIX.python22}/include/python2.2
+BUILDLINK_LDFLAGS.python22+= \
+	-L${BUILDLINK_PREFIX.python22}/lib/python2.2/config		\
+	-Wl,-R${BUILDLINK_PREFIX.python22}/lib/python2.2/config
+
+LDFLAGS+=	${BUILDLINK_LDFLAGS.python22}
 
 BUILDLINK_TARGETS+=	python22-buildlink