From 8920bb773e4a517785996ad7faac164698971c3e Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 29 Feb 2004 16:39:39 +0000 Subject: [PATCH] Remove workarounds for gcc2.95/sparc64 compiler bugs. From: Aleksander Piotrowski --- lang/python/2.1/Makefile | 6 +----- lang/python/2.1/patches/gcc-Makefile_pre_in | 12 ------------ lang/python/2.2/Makefile | 6 ++---- lang/python/2.2/patches/gcc-Makefile_pre_in | 13 ------------- lang/python/2.3/Makefile | 6 ++---- lang/python/2.3/patches/gcc-Makefile_pre_in | 12 ------------ 6 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 lang/python/2.1/patches/gcc-Makefile_pre_in delete mode 100644 lang/python/2.2/patches/gcc-Makefile_pre_in delete mode 100644 lang/python/2.3/patches/gcc-Makefile_pre_in diff --git a/lang/python/2.1/Makefile b/lang/python/2.1/Makefile index d9c3e3d54ed..42a09f9dffa 100644 --- a/lang/python/2.1/Makefile +++ b/lang/python/2.1/Makefile @@ -1,12 +1,8 @@ -# $OpenBSD: Makefile,v 1.5 2004/01/08 21:11:23 sturm Exp $ +# $OpenBSD: Makefile,v 1.6 2004/02/29 16:39:39 naddy 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.1/patches/gcc-Makefile_pre_in b/lang/python/2.1/patches/gcc-Makefile_pre_in deleted file mode 100644 index 80486f2a098..00000000000 --- a/lang/python/2.1/patches/gcc-Makefile_pre_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: gcc-Makefile_pre_in,v 1.1 2003/12/30 17:05:30 sturm Exp $ ---- Makefile.pre.in.orig Thu Jul 19 15:21:05 2001 -+++ Makefile.pre.in Mon Sep 24 13:40:20 2001 -@@ -408,6 +412,8 @@ - Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \ - $(srcdir)/Objects/unicodetype_db.h - -+Objects/longobject.o: -+ $(CC) -c $(PY_CFLAGS) -O0 -o $@ $< - - ############################################################################ - # Header files diff --git a/lang/python/2.2/Makefile b/lang/python/2.2/Makefile index 73e30ef4735..4729befee58 100644 --- a/lang/python/2.2/Makefile +++ b/lang/python/2.2/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2004/01/08 21:11:23 sturm Exp $ +# $OpenBSD: Makefile,v 1.7 2004/02/29 16:39:39 naddy Exp $ VERSION= 2.2 PATCHLEVEL= .3 PKG_PATCHLEVEL= p0 -.if ${MACHINE_ARCH} == "alpha" +.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") PATCH_LIST= patch-* sup64-* -.elif ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* sup64-* gcc-* .endif .include diff --git a/lang/python/2.2/patches/gcc-Makefile_pre_in b/lang/python/2.2/patches/gcc-Makefile_pre_in deleted file mode 100644 index 8c9f1945be1..00000000000 --- a/lang/python/2.2/patches/gcc-Makefile_pre_in +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: gcc-Makefile_pre_in,v 1.1 2003/12/30 17:05:30 sturm Exp $ ---- Makefile.pre.in.orig Wed Dec 19 04:24:40 2001 -+++ Makefile.pre.in Fri Feb 8 22:24:40 2002 -@@ -432,6 +432,9 @@ - Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \ - $(srcdir)/Objects/unicodetype_db.h - -+Objects/longobject.o: -+ $(CC) -c $(PY_CFLAGS) -O0 -o $@ $< -+ - ############################################################################ - # Header files - diff --git a/lang/python/2.3/Makefile b/lang/python/2.3/Makefile index 893240c3eb1..86132955bc7 100644 --- a/lang/python/2.3/Makefile +++ b/lang/python/2.3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2004/01/08 21:11:23 sturm Exp $ +# $OpenBSD: Makefile,v 1.3 2004/02/29 16:39:39 naddy Exp $ VERSION= 2.3 PATCHLEVEL= .3 @@ -17,10 +17,8 @@ LIB_DEPENDS= bz2::archivers/bzip2 FLAVORS= no_bsddb -.if ${MACHINE_ARCH} == "alpha" +.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") PATCH_LIST= patch-* sup64-* -.elif ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* sup64-* gcc-* .endif .include diff --git a/lang/python/2.3/patches/gcc-Makefile_pre_in b/lang/python/2.3/patches/gcc-Makefile_pre_in deleted file mode 100644 index 2fcc98de19c..00000000000 --- a/lang/python/2.3/patches/gcc-Makefile_pre_in +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.pre.in.orig Fri Dec 19 11:28:51 2003 -+++ Makefile.pre.in Fri Dec 19 11:29:39 2003 -@@ -461,6 +461,9 @@ - Objects/unicodectype.o: $(srcdir)/Objects/unicodectype.c \ - $(srcdir)/Objects/unicodetype_db.h - -+Objects/longobject.o: -+ $(CC) -c $(PY_CFLAGS) -O0 -o $@ $< -+ - ############################################################################ - # Header files -