From 92483009b1c1fc772ac675d007f884066fae829b Mon Sep 17 00:00:00 2001 From: recht Date: Wed, 10 Sep 2003 00:11:03 +0000 Subject: Correctly disable POSIX* and XOPEN* macros on < 1.6T. This should fix py-curses in hubertf's bulk build. Also add a patch from drochner@ for 1.5. Bump PKGREVISION 1, because the This the pyconfig.h header is affected. --- lang/python23-pth/Makefile | 3 ++- lang/python23-pth/distinfo | 5 +++-- lang/python23-pth/patches/patch-al | 43 ++++++++++++++++++-------------------- lang/python23-pth/patches/patch-bc | 21 +++++++++++++++++++ 4 files changed, 46 insertions(+), 26 deletions(-) create mode 100644 lang/python23-pth/patches/patch-bc (limited to 'lang/python23-pth') diff --git a/lang/python23-pth/Makefile b/lang/python23-pth/Makefile index 011d2149b03..281f960d1fa 100644 --- a/lang/python23-pth/Makefile +++ b/lang/python23-pth/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2003/09/04 18:31:43 recht Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/10 00:11:04 recht Exp $ # DISTNAME= Python-2.3 PKGNAME= python23-pth-2.3 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://ftp.python.org/pub/python/2.3/ EXTRACT_SUFX= .tgz diff --git a/lang/python23-pth/distinfo b/lang/python23-pth/distinfo index 35b0b6091bf..5dc27745420 100644 --- a/lang/python23-pth/distinfo +++ b/lang/python23-pth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2003/08/18 20:57:14 recht Exp $ +$NetBSD: distinfo,v 1.6 2003/09/10 00:11:04 recht Exp $ SHA1 (Python-2.3.tgz) = ce5fbde09be17ea5dddd4baa62d2b90e06e7e5c1 Size (Python-2.3.tgz) = 8436880 bytes @@ -9,6 +9,7 @@ SHA1 (patch-ah) = 9bc1b5bf1ee0e76fc19bd582299bf70ee3a10535 SHA1 (patch-ai) = 75d30db64343afcf2f0bcfe8e73dc9948acb237e SHA1 (patch-aj) = e2291bde6a59fc0441bc7c87c0946b7f5601aa5c SHA1 (patch-ak) = 341e7dd750e46463f6174676e06fd3a847efd311 -SHA1 (patch-al) = d45b39b975ea3b8d1e62b5e9006c79a40716f470 +SHA1 (patch-al) = 5614ef46970b5eea2bfdcfc64d1018aa0f4a6e85 SHA1 (patch-ba) = 9be4490e38c895dfc5041af1889ca7ab1c6d8bd9 SHA1 (patch-bb) = 1390c5f0bcd75f5f3f1b9949921b555e1021954f +SHA1 (patch-bc) = 0a83a90aea8a1414b43fa3506912ab09aafbc3c0 diff --git a/lang/python23-pth/patches/patch-al b/lang/python23-pth/patches/patch-al index 65d025b45aa..8c3c21b987d 100644 --- a/lang/python23-pth/patches/patch-al +++ b/lang/python23-pth/patches/patch-al @@ -1,47 +1,44 @@ -$NetBSD: patch-al,v 1.2 2003/08/18 17:16:55 recht Exp $ +$NetBSD: patch-al,v 1.3 2003/09/10 00:11:04 recht Exp $ --- pyconfig.h.in.orig 2003-07-22 17:20:49.000000000 +0200 -+++ pyconfig.h.in 2003-08-18 18:24:43.000000000 +0200 -@@ -835,6 +835,12 @@ ++++ pyconfig.h.in 2003-09-10 01:01:29.000000000 +0200 +@@ -835,6 +835,13 @@ /* Define _OSF_SOURCE to get the makedev macro. */ #undef _OSF_SOURCE +/* These defines disable needed library functions on NetBSD < 1.6T */ +/* ( _NETBSD_SOURCE doesn't exist prior to 1.6T ) */ -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) +#include -+#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 106200000) ++#endif ++#if !defined(__NetBSD__) || __NetBSD_Version__ > 106200000 + /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ #undef _POSIX_1_SOURCE -@@ -845,18 +851,30 @@ +@@ -845,18 +852,20 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE -+#endif -+#endif /* __NetBSD__ */ -+ - /* Define if you have POSIX threads, and your system does not define that. */ - #undef _POSIX_THREADS - - /* Define to force use of thread-safe errno, h_errno, and other functions */ - #undef _REENTRANT - -+/* These defines disable needed library functions on NetBSD < 1.6T */ -+/* ( _NETBSD_SOURCE doesn't exists prior to 1.6T ) */ -+#ifdef __NetBSD__ -+#include -+#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 106200000) -+ +-/* Define if you have POSIX threads, and your system does not define that. */ +-#undef _POSIX_THREADS +- +-/* Define to force use of thread-safe errno, h_errno, and other functions */ +-#undef _REENTRANT +- /* Define to the level of X/Open that your system supports */ #undef _XOPEN_SOURCE /* Define to activate Unix95-and-earlier features */ #undef _XOPEN_SOURCE_EXTENDED -+#endif -+#endif /* __NetBSD__ */ ++#endif /* __NetBSD_Version__ */ ++ ++/* Define if you have POSIX threads, and your system does not define that. */ ++#undef _POSIX_THREADS ++ ++/* Define to force use of thread-safe errno, h_errno, and other functions */ ++#undef _REENTRANT + /* Define on FreeBSD to activate all library features */ #undef __BSD_VISIBLE diff --git a/lang/python23-pth/patches/patch-bc b/lang/python23-pth/patches/patch-bc new file mode 100644 index 00000000000..5314c647014 --- /dev/null +++ b/lang/python23-pth/patches/patch-bc @@ -0,0 +1,21 @@ +$NetBSD: patch-bc,v 1.1 2003/09/10 00:11:04 recht Exp $ + +--- configure.orig Thu Jul 24 00:17:27 2003 ++++ configure +@@ -1365,6 +1365,8 @@ case $ac_sys_system/$ac_sys_release in + # Reconfirmed for OpenBSD 3.3 by Zachary Hamm. + OpenBSD/2.* | OpenBSD/3.[0123]) + define_xopen_source=no;; ++ NetBSD/1.5 | NetBSD/1.5.*) ++ define_xopen_source=no;; + # On Solaris 2.6, sys/wait.h is inconsistent in the usage + # of union __?sigval. Reported by Stuart Bishop. + SunOS/5.6) +@@ -13079,6 +13081,7 @@ cat >conftest.$ac_ext <<_ACEOF + #include "confdefs.h" + + #include "confdefs.h" ++#include + #include + #include + #include -- cgit v1.2.3