pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Add missing patches and disable PKGVIEW installat...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7338ca09aeda
branches: trunk
changeset: 475218:7338ca09aeda
user: recht <recht%pkgsrc.org@localhost>
date: Wed May 12 16:25:34 2004 +0000
description:
Add missing patches and disable PKGVIEW installation for now until the
issues with modules are sorted out.
diffstat:
lang/python23-pth/Makefile | 4 +-
lang/python23-pth/patches/patch-an | 67 ++++++++++++++++++++++++++++++++++++++
lang/python23-pth/patches/patch-ao | 14 +++++++
lang/python23/Makefile | 4 +-
lang/python23/Makefile.common | 4 +-
5 files changed, 88 insertions(+), 5 deletions(-)
diffs (139 lines):
diff -r b35f80b29898 -r 7338ca09aeda lang/python23-pth/Makefile
--- a/lang/python23-pth/Makefile Wed May 12 16:19:32 2004 +0000
+++ b/lang/python23-pth/Makefile Wed May 12 16:25:34 2004 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2004/05/12 15:19:49 recht Exp $
+# $NetBSD: Makefile,v 1.23 2004/05/12 16:25:34 recht Exp $
#
PKGNAME= python23-pth-2.3.3
PKGREVISION= 4
+#PKG_INSTALLATION_TYPES= overwrite pkgviews
+
PTHREAD_OPTS= require
.include "../../mk/pthread.buildlink3.mk"
.if ${PTHREAD_TYPE} == "pth"
diff -r b35f80b29898 -r 7338ca09aeda lang/python23-pth/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python23-pth/patches/patch-an Wed May 12 16:25:34 2004 +0000
@@ -0,0 +1,67 @@
+$NetBSD: patch-an,v 1.1 2004/05/12 16:25:34 recht Exp $
+
+diff -u python/dist/src/Objects/weakrefobject.c:1.13.6.1 python/dist/src/Objects/weakrefobject.c:1.13.6.3
+--- Objects/weakrefobject.c:1.13.6.1 Thu Nov 20 14:13:51 2003
++++ Objects/weakrefobject.c Wed Feb 4 15:13:43 2004
+@@ -624,20 +624,29 @@
+ }
+ list = GET_WEAKREFS_LISTPTR(ob);
+ get_basic_refs(*list, &ref, &proxy);
+- if (callback == NULL || callback == Py_None)
++ if (callback == Py_None)
++ callback = NULL;
++ if (callback == NULL)
+ /* return existing weak reference if it exists */
+ result = ref;
+ if (result != NULL)
+- Py_XINCREF(result);
++ Py_INCREF(result);
+ else {
++ /* Note: new_weakref() can trigger cyclic GC, so the weakref
++ list on ob can be mutated. This means that the ref and
++ proxy pointers we got back earlier may have been collected,
++ so we need to compute these values again before we use
++ them. */
+ result = new_weakref(ob, callback);
+ if (result != NULL) {
+ if (callback == NULL) {
+ insert_head(result, list);
+ }
+ else {
+- PyWeakReference *prev = (proxy == NULL) ? ref : proxy;
++ PyWeakReference *prev;
+
++ get_basic_refs(*list, &ref, &proxy);
++ prev = (proxy == NULL) ? ref : proxy;
+ if (prev == NULL)
+ insert_head(result, list);
+ else
+@@ -664,12 +673,19 @@
+ }
+ list = GET_WEAKREFS_LISTPTR(ob);
+ get_basic_refs(*list, &ref, &proxy);
++ if (callback == Py_None)
++ callback = NULL;
+ if (callback == NULL)
+ /* attempt to return an existing weak reference if it exists */
+ result = proxy;
+ if (result != NULL)
+- Py_XINCREF(result);
++ Py_INCREF(result);
+ else {
++ /* Note: new_weakref() can trigger cyclic GC, so the weakref
++ list on ob can be mutated. This means that the ref and
++ proxy pointers we got back earlier may have been collected,
++ so we need to compute these values again before we use
++ them. */
+ result = new_weakref(ob, callback);
+ if (result != NULL) {
+ PyWeakReference *prev;
+@@ -678,6 +694,7 @@
+ result->ob_type = &_PyWeakref_CallableProxyType;
+ else
+ result->ob_type = &_PyWeakref_ProxyType;
++ get_basic_refs(*list, &ref, &proxy);
+ if (callback == NULL)
+ prev = ref;
+ else
diff -r b35f80b29898 -r 7338ca09aeda lang/python23-pth/patches/patch-ao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python23-pth/patches/patch-ao Wed May 12 16:25:34 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1 2004/05/12 16:25:34 recht Exp $
+
+diff -u python/dist/src/Objects/intobject.c:2.105 python/dist/src/Objects/intobject.c:2.105.8.1
+--- Objects/intobject.c:2.105 Sat Jun 28 13:04:24 2003
++++ Objects/intobject.c Sun Feb 8 10:56:07 2004
+@@ -1080,7 +1080,7 @@
+ int ival;
+ #if NSMALLNEGINTS + NSMALLPOSINTS > 0
+ for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) {
+- if ((free_list = fill_free_list()) == NULL)
++ if (!free_list && (free_list = fill_free_list()) == NULL)
+ return 0;
+ /* PyObject_New is inlined */
+ v = free_list;
diff -r b35f80b29898 -r 7338ca09aeda lang/python23/Makefile
--- a/lang/python23/Makefile Wed May 12 16:19:32 2004 +0000
+++ b/lang/python23/Makefile Wed May 12 16:25:34 2004 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2004/05/12 15:19:49 recht Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/12 16:25:34 recht Exp $
#
PKGNAME= python23-2.3.3
PKGREVISION= 3
+#PKG_INSTALLATION_TYPES= overwrite pkgviews
+
CONFIGURE_ARGS+= --without-threads
PY_VER_SUFFIX= 2.3
diff -r b35f80b29898 -r 7338ca09aeda lang/python23/Makefile.common
--- a/lang/python23/Makefile.common Wed May 12 16:19:32 2004 +0000
+++ b/lang/python23/Makefile.common Wed May 12 16:25:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2004/05/12 15:19:49 recht Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/05/12 16:25:34 recht Exp $
#
DISTNAME= Python-2.3.3
@@ -10,8 +10,6 @@
HOMEPAGE= http://www.python.org/
COMMENT= Interpreted, interactive, object-oriented programming language
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
USE_LANGUAGES= c c++
USE_GCC_SHLIB= yes
USE_BUILDLINK3= yes
Home |
Main Index |
Thread Index |
Old Index