From 220641dd7fbe14fec6de1f9439403db6d59a3287 Mon Sep 17 00:00:00 2001 From: sturm Date: Thu, 8 Jan 2004 21:11:22 +0000 Subject: [PATCH] fix braino in PATCH_LIST handling --- lang/python/2.1/Makefile | 6 +++++- lang/python/2.2/Makefile | 8 +++++++- lang/python/2.3/Makefile | 8 +++++++- lang/python/Makefile.inc | 8 ++------ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lang/python/2.1/Makefile b/lang/python/2.1/Makefile index 80c61a20da9..d9c3e3d54ed 100644 --- a/lang/python/2.1/Makefile +++ b/lang/python/2.1/Makefile @@ -1,8 +1,12 @@ -# $OpenBSD: Makefile,v 1.4 2004/01/03 17:32:57 sturm Exp $ +# $OpenBSD: Makefile,v 1.5 2004/01/08 21:11:23 sturm Exp $ VERSION= 2.1 PATCHLEVEL= .3 PKG_PATCHLEVEL= p2 +.if ${MACHINE_ARCH} == "sparc64" +PATCH_LIST= patch-* gcc-* +.endif + .include diff --git a/lang/python/2.2/Makefile b/lang/python/2.2/Makefile index 324dddd03ae..73e30ef4735 100644 --- a/lang/python/2.2/Makefile +++ b/lang/python/2.2/Makefile @@ -1,8 +1,14 @@ -# $OpenBSD: Makefile,v 1.5 2004/01/03 17:32:57 sturm Exp $ +# $OpenBSD: Makefile,v 1.6 2004/01/08 21:11:23 sturm Exp $ VERSION= 2.2 PATCHLEVEL= .3 PKG_PATCHLEVEL= p0 +.if ${MACHINE_ARCH} == "alpha" +PATCH_LIST= patch-* sup64-* +.elif ${MACHINE_ARCH} == "sparc64" +PATCH_LIST= patch-* sup64-* gcc-* +.endif + .include diff --git a/lang/python/2.3/Makefile b/lang/python/2.3/Makefile index e1f17dc6dd4..893240c3eb1 100644 --- a/lang/python/2.3/Makefile +++ b/lang/python/2.3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2003/12/31 17:38:25 sturm Exp $ +# $OpenBSD: Makefile,v 1.2 2004/01/08 21:11:23 sturm Exp $ VERSION= 2.3 PATCHLEVEL= .3 @@ -17,4 +17,10 @@ LIB_DEPENDS= bz2::archivers/bzip2 FLAVORS= no_bsddb +.if ${MACHINE_ARCH} == "alpha" +PATCH_LIST= patch-* sup64-* +.elif ${MACHINE_ARCH} == "sparc64" +PATCH_LIST= patch-* sup64-* gcc-* +.endif + .include diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc index 9301f60e940..979be73d7e7 100644 --- a/lang/python/Makefile.inc +++ b/lang/python/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.14 2003/12/31 17:40:20 sturm Exp $ +# $OpenBSD: Makefile.inc,v 1.15 2004/01/08 21:11:22 sturm Exp $ # IMPORTANT! If you make any changes to the Python ports, be sure # to also update files/CHANGES.OpenBSD for your change. This is a @@ -160,11 +160,7 @@ CONFIGURE_ARGS+= --with-fpectl --with-threads REGRESS_TARGET= test -.if ${MACHINE_ARCH} == "alpha" -PATCH_LIST= patch-* sup64-* -NO64BIT= \# -.elif ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* sup64-* gcc-* +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" NO64BIT= \# .endif