diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2004-02-24 08:19:54 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2004-02-24 08:19:54 +0000 |
| commit | 1efbe2254e0f2716aa30240bb0c5cab6b41fe2bf (patch) | |
| tree | 4ce1d3966b275ad57ffb8efbea18c5267c0abdd6 | |
| parent | Remove unused patch for `./configure', which confuses users. (diff) | |
- 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.
Notes
Notes:
svn path=/head/; revision=101946
| -rw-r--r-- | lang/python/Makefile | 2 | ||||
| -rw-r--r-- | lang/python/files/patch-Lib::distutils::spawn.py | 17 | ||||
| -rw-r--r-- | lang/python23/Makefile | 2 | ||||
| -rw-r--r-- | lang/python23/files/patch-Lib::distutils::spawn.py | 17 | ||||
| -rw-r--r-- | lang/python24/Makefile | 2 | ||||
| -rw-r--r-- | lang/python24/files/patch-Lib::distutils::spawn.py | 17 |
6 files changed, 54 insertions, 3 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" % \ diff --git a/lang/python23/Makefile b/lang/python23/Makefile index cca1766771f9..516eac521283 100644 --- a/lang/python23/Makefile +++ b/lang/python23/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/python23/files/patch-Lib::distutils::spawn.py b/lang/python23/files/patch-Lib::distutils::spawn.py new file mode 100644 index 000000000000..208b10fc1083 --- /dev/null +++ b/lang/python23/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" % \ diff --git a/lang/python24/Makefile b/lang/python24/Makefile index cca1766771f9..516eac521283 100644 --- a/lang/python24/Makefile +++ b/lang/python24/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/python24/files/patch-Lib::distutils::spawn.py b/lang/python24/files/patch-Lib::distutils::spawn.py new file mode 100644 index 000000000000..208b10fc1083 --- /dev/null +++ b/lang/python24/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" % \ |