From 7d23fbaed5bc0db2a2b3140d60ebd29a846bf6e8 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 9 Aug 2013 10:54:17 +0000 Subject: Copy the patch which disables use of Posix semaphores on NetBSD from Python2 to Python3. Without that, selftests fail in multiple places. bump PKGREV --- lang/python32/Makefile | 4 ++-- lang/python32/distinfo | 3 ++- lang/python32/patches/patch-xa | 14 ++++++++++++++ lang/python33/Makefile | 4 +++- lang/python33/distinfo | 3 ++- lang/python33/patches/patch-xa | 14 ++++++++++++++ 6 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 lang/python32/patches/patch-xa create mode 100644 lang/python33/patches/patch-xa (limited to 'lang') diff --git a/lang/python32/Makefile b/lang/python32/Makefile index d34f1e7bb8c..e9fc6acc36f 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2013/07/15 02:02:24 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2013/08/09 10:54:17 drochner Exp $ .include "dist.mk" PKGNAME= python32-${PY_DISTVERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/python32/distinfo b/lang/python32/distinfo index ec4797e7b89..02c23885e1c 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2013/01/09 17:01:02 reed Exp $ +$NetBSD: distinfo,v 1.5 2013/08/09 10:54:17 drochner Exp $ SHA1 (Python-3.2.3.tar.bz2) = 4c2d562a0681ba27bc920500050e2f08de224311 RMD160 (Python-3.2.3.tar.bz2) = a4d902bc4436ea28df3d706015afd6e0f50131f4 @@ -15,3 +15,4 @@ SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc SHA1 (patch-modules__posixsubprocess.c) = 39790dbcfb0d99e7dafa6a175bb65dcfc190168f SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c +SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be diff --git a/lang/python32/patches/patch-xa b/lang/python32/patches/patch-xa new file mode 100644 index 00000000000..311fe4297db --- /dev/null +++ b/lang/python32/patches/patch-xa @@ -0,0 +1,14 @@ +$NetBSD: patch-xa,v 1.1 2013/08/09 10:54:17 drochner Exp $ + +--- Python/thread_pthread.h.orig 2013-05-15 16:33:00.000000000 +0000 ++++ Python/thread_pthread.h +@@ -50,6 +50,9 @@ + we need to add 0 to make it work there as well. */ + #if (_POSIX_SEMAPHORES+0) == -1 + #define HAVE_BROKEN_POSIX_SEMAPHORES ++#elif defined(__NetBSD__) ++/* XXX accesses to closed file descriptors, needs debugging */ ++#define HAVE_BROKEN_POSIX_SEMAPHORES + #else + #include + #include diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 3f9491cbabf..24d54b079eb 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2013/08/02 07:03:49 adam Exp $ +# $NetBSD: Makefile,v 1.10 2013/08/09 10:54:17 drochner Exp $ .include "dist.mk" +PKGREVISION= 1 + PKGNAME= python33-${PY_DISTVERSION} CATEGORIES= lang python diff --git a/lang/python33/distinfo b/lang/python33/distinfo index 6533cec7731..a3c2160e5e9 100644 --- a/lang/python33/distinfo +++ b/lang/python33/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2013/08/02 07:03:49 adam Exp $ +$NetBSD: distinfo,v 1.5 2013/08/09 10:54:17 drochner Exp $ SHA1 (Python-3.3.2.tar.bz2) = b28c36a9752b690059dc6df4fb9b4ec9d6c5708a RMD160 (Python-3.3.2.tar.bz2) = 7383734cbbd9e15b5d883063e1266abf368fd8e4 @@ -14,3 +14,4 @@ SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c +SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be diff --git a/lang/python33/patches/patch-xa b/lang/python33/patches/patch-xa new file mode 100644 index 00000000000..311fe4297db --- /dev/null +++ b/lang/python33/patches/patch-xa @@ -0,0 +1,14 @@ +$NetBSD: patch-xa,v 1.1 2013/08/09 10:54:17 drochner Exp $ + +--- Python/thread_pthread.h.orig 2013-05-15 16:33:00.000000000 +0000 ++++ Python/thread_pthread.h +@@ -50,6 +50,9 @@ + we need to add 0 to make it work there as well. */ + #if (_POSIX_SEMAPHORES+0) == -1 + #define HAVE_BROKEN_POSIX_SEMAPHORES ++#elif defined(__NetBSD__) ++/* XXX accesses to closed file descriptors, needs debugging */ ++#define HAVE_BROKEN_POSIX_SEMAPHORES + #else + #include + #include -- cgit v1.2.3