Hi,
I did not reply earlier because I had a silly error that I could not resolve --
but I did test and this was the problem I had on i386
# sysctl kern.version
kern.version=OpenBSD 4.9-current (GENERIC) #5: Sun Jul 10 21:29:01 MDT 2011
[email protected]:/usr/src/sys/arch/i386/compile/GENERIC
# cd /home/ports/lang/python3
# patch -p0 < python-3.2.1.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: Makefile.inc
|===================================================================
|RCS file: /cvs/ports/lang/python3/Makefile.inc,v
|retrieving revision 1.2
|diff -u -p -r1.2 Makefile.inc
|--- Makefile.inc 29 Jun 2011 11:58:31 -0000 1.2
|+++ Makefile.inc 11 Jul 2011 19:20:08 -0000
--------------------------
Patching file Makefile.inc using Plan A...
Hunk #1 succeeded at 8.
Hunk #2 succeeded at 36.
Hunk #3 succeeded at 53.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/Makefile
|===================================================================
|RCS file: /cvs/ports/lang/python3/3.2/Makefile,v
|retrieving revision 1.2
|diff -u -p -r1.2 Makefile
|--- 3.2/Makefile 29 Jun 2011 11:58:31 -0000 1.2
|+++ 3.2/Makefile 11 Jul 2011 19:20:08 -0000
--------------------------
Patching file 3.2/Makefile using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/distinfo
|===================================================================
|RCS file: /cvs/ports/lang/python3/3.2/distinfo,v
|retrieving revision 1.1.1.1
|diff -u -p -r1.1.1.1 distinfo
|--- 3.2/distinfo 27 Jun 2011 18:44:13 -0000 1.1.1.1
|+++ 3.2/distinfo 11 Jul 2011 19:20:08 -0000
--------------------------
Patching file 3.2/distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/patches/patch-Lib_test_test_capi_py
|===================================================================
|RCS file: 3.2/patches/patch-Lib_test_test_capi_py
|diff -N 3.2/patches/patch-Lib_test_test_capi_py
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ 3.2/patches/patch-Lib_test_test_capi_py 11 Jul 2011 19:20:08 -0000
--------------------------
(Creating file 3.2/patches/patch-Lib_test_test_capi_py...)
Patching file 3.2/patches/patch-Lib_test_test_capi_py using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/patches/patch-Lib_test_test_io_py
|===================================================================
|RCS file: 3.2/patches/patch-Lib_test_test_io_py
|diff -N 3.2/patches/patch-Lib_test_test_io_py
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ 3.2/patches/patch-Lib_test_test_io_py 11 Jul 2011 19:20:08 -0000
--------------------------
(Creating file 3.2/patches/patch-Lib_test_test_io_py...)
Patching file 3.2/patches/patch-Lib_test_test_io_py using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/patches/patch-Lib_test_test_regrtest_py
|===================================================================
|RCS file: 3.2/patches/patch-Lib_test_test_regrtest_py
|diff -N 3.2/patches/patch-Lib_test_test_regrtest_py
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ 3.2/patches/patch-Lib_test_test_regrtest_py 11 Jul 2011 19:20:08
-0000
--------------------------
(Creating file 3.2/patches/patch-Lib_test_test_regrtest_py...)
Patching file 3.2/patches/patch-Lib_test_test_regrtest_py using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/patches/patch-Lib_test_test_socket_py
|===================================================================
|RCS file: 3.2/patches/patch-Lib_test_test_socket_py
|diff -N 3.2/patches/patch-Lib_test_test_socket_py
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ 3.2/patches/patch-Lib_test_test_socket_py 11 Jul 2011 19:20:08 -0000
--------------------------
(Creating file 3.2/patches/patch-Lib_test_test_socket_py...)
Patching file 3.2/patches/patch-Lib_test_test_socket_py using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/patches/patch-Lib_test_test_subprocess_py
|===================================================================
|RCS file: 3.2/patches/patch-Lib_test_test_subprocess_py
|diff -N 3.2/patches/patch-Lib_test_test_subprocess_py
|--- /dev/null 1 Jan 1970 00:00:00 -0000
|+++ 3.2/patches/patch-Lib_test_test_subprocess_py 11 Jul 2011 19:20:08
-0000
--------------------------
(Creating file 3.2/patches/patch-Lib_test_test_subprocess_py...)
Patching file 3.2/patches/patch-Lib_test_test_subprocess_py using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/pkg/PLIST-main
|===================================================================
|RCS file: /cvs/ports/lang/python3/3.2/pkg/PLIST-main,v
|retrieving revision 1.2
|diff -u -p -r1.2 PLIST-main
|--- 3.2/pkg/PLIST-main 28 Jun 2011 09:29:28 -0000 1.2
|+++ 3.2/pkg/PLIST-main 11 Jul 2011 19:20:11 -0000
--------------------------
Patching file 3.2/pkg/PLIST-main using Plan A...
Hunk #1 succeeded at 1005.
Hunk #2 succeeded at 1725.
Hunk #3 succeeded at 1780.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: 3.2/pkg/PLIST-tests
|===================================================================
|RCS file: /cvs/ports/lang/python3/3.2/pkg/PLIST-tests,v
|retrieving revision 1.1.1.1
|diff -u -p -r1.1.1.1 PLIST-tests
|--- 3.2/pkg/PLIST-tests 27 Jun 2011 18:44:15 -0000 1.1.1.1
|+++ 3.2/pkg/PLIST-tests 11 Jul 2011 19:20:12 -0000
--------------------------
Patching file 3.2/pkg/PLIST-tests using Plan A...
Hunk #1 succeeded at 13.
Hunk #2 succeeded at 161.
Hunk #3 succeeded at 445.
Hunk #4 succeeded at 683.
Hunk #5 succeeded at 821.
Hunk #6 succeeded at 1168.
Hunk #7 succeeded at 1315.
Hunk #8 succeeded at 1434.
done
So I did a make regress and got the following error
# make regress
===> lang/python3/3.2
===> Patching for Python-3.2.1
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/tempfile.py.rej
***> patch-Lib_tempfile_py did not apply cleanly
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/test/regrtest.py.rej
***> patch-Lib_test_regrtest_py did not apply cleanly
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/test/test_capi.py.rej
***> patch-Lib_test_test_capi_py did not apply cleanly
===> Ignoring patchfile patch-Lib_test_test_capi_py.orig
Ignoring previously applied (or reversed) patch.
3 out of 3 hunks ignored--saving rejects to Lib/test/test_io.py.rej
***> patch-Lib_test_test_io_py did not apply cleanly
===> Ignoring patchfile patch-Lib_test_test_io_py.orig
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/test/regrtest.py.rej
***> patch-Lib_test_test_regrtest_py did not apply cleanly
===> Ignoring patchfile patch-Lib_test_test_regrtest_py.orig
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/test/test_socket.py.rej
***> patch-Lib_test_test_socket_py did not apply cleanly
===> Ignoring patchfile patch-Lib_test_test_socket_py.orig
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/test/test_subprocess.py.rej
***> patch-Lib_test_test_subprocess_py did not apply cleanly
===> Ignoring patchfile patch-Lib_test_test_subprocess_py.orig
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to Makefile.pre.in.rej
***> patch-Makefile_pre_in did not apply cleanly
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Modules/makesetup.rej
***> patch-Modules_makesetup did not apply cleanly
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Modules/pyexpat.c.rej
***> patch-Modules_pyexpat_c did not apply cleanly
Ignoring previously applied (or reversed) patch.
3 out of 3 hunks ignored--saving rejects to Modules/selectmodule.c.rej
***> patch-Modules_selectmodule_c did not apply cleanly
Ignoring previously applied (or reversed) patch.
4 out of 4 hunks ignored--saving rejects to configure.in.rej
***> patch-configure_in did not apply cleanly
*** Error code 1
Stop in /home/ports/lang/python3/3.2 (line 2388 of
/home/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1
Stop in /home/ports/lang/python3/3.2 (line 2251 of
/home/ports/infrastructure/mk/bsd.port.mk).
===> Exiting lang/python3/3.2 with an error
*** Error code 1
Stop in /home/ports/lang/python3 (line 138 of
/home/ports/infrastructure/mk/bsd.port.subdir.mk).
#
If I do a make clean and then make I get
===> Checking files for Python-3.2.1
`/home/ports/distfiles/Python-3.2.1.tgz' is up to date.
>> (SHA256) Python-3.2.1.tgz: OK
===> Extracting for Python-3.2.1
rm -r /home/ports/pobj/Python-3.2.1/Python-3.2.1/Modules/expat
rm -r /home/ports/pobj/Python-3.2.1/Python-3.2.1/Modules/_ctypes/libffi
===> Patching for Python-3.2.1
===> Ignoring patchfile patch-Lib_test_test_capi_py.orig
===> Ignoring patchfile patch-Lib_test_test_io_py.orig
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to Lib/test/regrtest.py.rej
***> patch-Lib_test_test_regrtest_py did not apply cleanly
===> Ignoring patchfile patch-Lib_test_test_regrtest_py.orig
===> Ignoring patchfile patch-Lib_test_test_socket_py.orig
===> Ignoring patchfile patch-Lib_test_test_subprocess_py.orig
*** Error code 1
Stop in /home/ports/lang/python3/3.2 (line 2388 of
/home/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1
Stop in /home/ports/lang/python3/3.2 (line 2251 of
/home/ports/infrastructure/mk/bsd.port.mk).
===> Exiting lang/python3/3.2 with an error
*** Error code 1
Stop in /home/ports/lang/python3 (line 138 of
/home/ports/infrastructure/mk/bsd.port.subdir.mk).
If there is anything else I can try, please let me know.
Thank you,
Vijay
On 2011-07-17, at 10:36 AM, Remi Pointel wrote:
> On Wed, 13 Jul 2011 10:43:47 +0200
> [email protected] wrote:
>> Hello,
>>
>> Python 3.2.1 have been released.
>>
>> Attached is the diff to update Python 3.2 to Python 3.2.1.
>>
>> Could you test the diff and make regress on arch != amd64 and sparc64,
>> and send me the results please.
>>
>> Thanks a lot,
>
> Hi,
>
> has someone tested my diff ?
>
> Cheers,
>
> Remi.
>
Vijay Sankar
[email protected]
