aboutsummaryrefslogtreecommitdiffstats
path: root/lang/python
diff options
context:
space:
mode:
authorperky <perky@FreeBSD.org>2004-02-24 16:19:54 +0800
committerperky <perky@FreeBSD.org>2004-02-24 16:19:54 +0800
commitaf19ee1d368b7cec218607198712b7faeaf017b1 (patch)
treebc0aae1f2f1143e86f339dbd952c3015dbc8fb2a /lang/python
parent89e125d4c331703149aa09d613df39b776b089f8 (diff)
downloadfreebsd-ports-gnome-af19ee1d368b7cec218607198712b7faeaf017b1.tar.gz
freebsd-ports-gnome-af19ee1d368b7cec218607198712b7faeaf017b1.tar.zst
freebsd-ports-gnome-af19ee1d368b7cec218607198712b7faeaf017b1.zip
- Add a workaround for the net/straw port installation problem
recently introduced by libpthread. The problem was that waitpid(2) raised EINTR but python's distutils didn't catch it correctly. - PORTREVISION is bumped to 2, subsequently.
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/Makefile2
-rw-r--r--lang/python/files/patch-Lib::distutils::spawn.py17
2 files changed, 18 insertions, 1 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile
index cca1766771f9..516eac521283 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,7 +7,7 @@
PORTNAME= python
PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python/files/patch-Lib::distutils::spawn.py b/lang/python/files/patch-Lib::distutils::spawn.py
new file mode 100644
index 000000000000..208b10fc1083
--- /dev/null
+++ b/lang/python/files/patch-Lib::distutils::spawn.py
@@ -0,0 +1,17 @@
+--- Lib/distutils/spawn.py.orig Tue Feb 24 16:55:44 2004
++++ Lib/distutils/spawn.py Tue Feb 24 16:56:01 2004
+@@ -144,7 +144,13 @@
+ # Loop until the child either exits or is terminated by a signal
+ # (ie. keep waiting if it's merely stopped)
+ while 1:
+- (pid, status) = os.waitpid(pid, 0)
++ try:
++ (pid, status) = os.waitpid(pid, 0)
++ except OSError, exc:
++ import errno
++ if exc.errno == errno.EINTR:
++ continue
++ raise exc
+ if os.WIFSIGNALED(status):
+ raise DistutilsExecError, \
+ "command '%s' terminated by signal %d" % \