diff options
| author | sbd <sbd> | 2012-05-10 08:10:00 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-05-10 08:10:00 +0000 |
| commit | 3fbdf085d4698fcf44137cbb404508eaf839e12e (patch) | |
| tree | 45707d7f4c5bf2818b1bd3406e00ae27d941c258 | |
| parent | 67a8dedf8f277153ee962af8eca35d8ee847b219 (diff) | |
| download | pkgsrc-3fbdf085d4698fcf44137cbb404508eaf839e12e.tar.gz | |
"sys.platform is now always 'linux2' on Linux", so revert the linux3 handling
and always set PY_PLATNAME to 'linux2'.
| -rw-r--r-- | lang/python27/Makefile | 8 | ||||
| -rw-r--r-- | lang/python27/PLIST.Linux (renamed from lang/python27/PLIST.Linux2) | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile index c45262ba822..d5e711694a9 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/04/13 18:47:27 adam Exp $ +# $NetBSD: Makefile,v 1.16 2012/05/10 08:10:00 sbd Exp $ .include "dist.mk" @@ -69,15 +69,13 @@ PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} PY_PLATNAME= sunos${OS_VERSION:C/\..*//} .elif ${OPSYS} == "HPUX" PY_PLATNAME= hp-ux11 +.elif ${OPSYS} == "Linux" +PY_PLATNAME= linux2 .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} -.if ${PY_PLATNAME} == "linux2" -PLIST_SRC+= ${.CURDIR}/../../lang/python27/PLIST.Linux2 -.endif - .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ (defined(ABI) && ${ABI} == "64") diff --git a/lang/python27/PLIST.Linux2 b/lang/python27/PLIST.Linux index b94ebd9d396..347d0f07997 100644 --- a/lang/python27/PLIST.Linux2 +++ b/lang/python27/PLIST.Linux @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.Linux2,v 1.1 2012/03/05 08:23:24 sbd Exp $ +@comment $NetBSD: PLIST.Linux,v 1.3 2012/05/10 08:10:00 sbd Exp $ lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.py lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyc lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyo |