diff options
| author | dsainty <dsainty> | 2011-10-28 10:38:07 +0000 |
|---|---|---|
| committer | dsainty <dsainty> | 2011-10-28 10:38:07 +0000 |
| commit | 936cc77f5eec19e5867fb379fe2bbaa96e5a396f (patch) | |
| tree | f826444ceef344b4f4f66ff9322a25418834c08d /lang | |
| parent | 7ffe5f802818f2a63ef2cd464723687956168a92 (diff) | |
| download | pkgsrc-936cc77f5eec19e5867fb379fe2bbaa96e5a396f.tar.gz | |
Internally, Python has a set of modules depending on "platform". The
"platform" in Python terms is different for Linux kernel 2.* Vs Linux
kernel 3.*. Add in support to pull in a different PLIST for Linux 3.*.
Fixes build under Ubuntu 11.10.
XXX Perhaps it would be cleaner to name the PLIST to match the python platform
name - since we already calculate that anyway, and that is exactly what drives
the contents of these PLISTs.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python26/Makefile | 21 | ||||
| -rw-r--r-- | lang/python26/PLIST.Linux3 | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 1c4aee890bd..05a27f17663 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2011/09/16 10:08:20 adam Exp $ +# $NetBSD: Makefile,v 1.43 2011/10/28 10:38:07 dsainty Exp $ .include "dist.mk" @@ -47,12 +47,6 @@ LIBS.SunOS+= -lrt PY_VER_SUFFIX= 2.6 -PLIST_SRC= ${.CURDIR}/../../lang/python26/PLIST.common -.if exists(${.CURDIR}/../../lang/python26/PLIST.${OPSYS}) -PLIST_SRC+= ${.CURDIR}/../../lang/python26/PLIST.${OPSYS} -.endif -PLIST_SRC+= ${.CURDIR}/../../lang/python26/PLIST.common_end - .if ${OPSYS} == "NetBSD" PRIVILEGED_STAGES+= clean # XXX work around a botched autoconf check which ignores libintl @@ -74,6 +68,19 @@ PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} +# PLIST to match ${WRKSRC}/Lib/plat-linux3 +.if ${PY_PLATNAME} == "linux3" +PL_OPSYS=${OPSYS}3 +.else +PL_OPSYS=${OPSYS} +.endif + +PLIST_SRC= ${.CURDIR}/../../lang/python26/PLIST.common +.if exists(${.CURDIR}/../../lang/python26/PLIST.${PL_OPSYS}) +PLIST_SRC+= ${.CURDIR}/../../lang/python26/PLIST.${PL_OPSYS} +.endif +PLIST_SRC+= ${.CURDIR}/../../lang/python26/PLIST.common_end + .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ (defined(ABI) && ${ABI} == "64") diff --git a/lang/python26/PLIST.Linux3 b/lang/python26/PLIST.Linux3 new file mode 100644 index 00000000000..dbd0c7f438a --- /dev/null +++ b/lang/python26/PLIST.Linux3 @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST.Linux3,v 1.1 2011/10/28 10:38:07 dsainty Exp $ +lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.py +lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyc +lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyo |