On 2011-07-17, at 11:14 AM, Remi Pointel wrote: > On Sun, 17 Jul 2011 11:06:40 -0500 > Vijay Sankar <vsan...@foretell.ca> wrote: >> Hi, > > Hello, > >> So I did a make regress and got the following error > > Could you remove 3.2/patches/*.orig, and verify that all files with .rej > extension have a null size ? > If yes, could you remove 3.2/patches/*.ref also? > > and make regress into 3.2 subdirectory: > # cd 3.2 > # make regress > > Thanks for your tests :) > > Remi. >
Hi, I had tried that earlier but one problem was that I could not figure out why rej files were created even though the patch applied cleanly. So I followed your suggestions and got the following: # pwd /home/ports/lang/python3/3.2 # cd patches/ # ls CVS patch-Lib_test_test_socket_py patch-Lib_tempfile_py patch-Lib_test_test_socket_py.orig patch-Lib_test_regrtest_py patch-Lib_test_test_subprocess_py patch-Lib_test_test_capi_py patch-Lib_test_test_subprocess_py.orig patch-Lib_test_test_capi_py.orig patch-Makefile_pre_in patch-Lib_test_test_io_py patch-Modules_makesetup patch-Lib_test_test_io_py.orig patch-Modules_pyexpat_c patch-Lib_test_test_regrtest_py patch-Modules_selectmodule_c patch-Lib_test_test_regrtest_py.orig patch-configure_in # ls -l total 52 drwxr-xr-x 2 root wheel 512 Jul 12 05:01 CVS -rw-r--r-- 1 root wheel 498 Jun 27 13:44 patch-Lib_tempfile_py -rw-r--r-- 1 root wheel 588 Jun 27 13:44 patch-Lib_test_regrtest_py -rw-r--r-- 1 root wheel 388 Jul 17 05:55 patch-Lib_test_test_capi_py -rw-r--r-- 1 root wheel 0 Jul 17 05:55 patch-Lib_test_test_capi_py.orig -rw-r--r-- 1 root wheel 1906 Jul 17 05:55 patch-Lib_test_test_io_py -rw-r--r-- 1 root wheel 0 Jul 17 05:55 patch-Lib_test_test_io_py.orig -rw-r--r-- 1 root wheel 588 Jul 17 05:55 patch-Lib_test_test_regrtest_py -rw-r--r-- 1 root wheel 0 Jul 17 05:55 patch-Lib_test_test_regrtest_py.orig -rw-r--r-- 1 root wheel 360 Jul 17 05:55 patch-Lib_test_test_socket_py -rw-r--r-- 1 root wheel 0 Jul 17 05:55 patch-Lib_test_test_socket_py.orig -rw-r--r-- 1 root wheel 559 Jul 17 05:55 patch-Lib_test_test_subprocess_py -rw-r--r-- 1 root wheel 0 Jul 17 05:55 patch-Lib_test_test_subprocess_py.orig -rw-r--r-- 1 root wheel 832 Jun 27 13:44 patch-Makefile_pre_in -rw-r--r-- 1 root wheel 487 Jun 27 13:44 patch-Modules_makesetup -rw-r--r-- 1 root wheel 606 Jun 27 13:44 patch-Modules_pyexpat_c -rw-r--r-- 1 root wheel 1852 Jun 27 13:44 patch-Modules_selectmodule_c -rw-r--r-- 1 root wheel 1893 Jun 27 13:44 patch-configure_in # rm *.orig # ls *.rej ls: *.rej: No such file or directory # pwd /home/ports/lang/python3/3.2/patches # cd ../ # ls CVS Makefile.orig distinfo.orig pkg Makefile distinfo patches # rm *.orig # ls -l total 20 drwxr-xr-x 2 root wheel 512 Jul 12 05:01 CVS -rw-r--r-- 1 root wheel 174 Jul 17 05:55 Makefile -rw-r--r-- 1 root wheel 270 Jul 17 05:55 distinfo drwxr-xr-x 3 root wheel 1024 Jul 17 06:16 patches drwxr-xr-x 3 root wheel 512 Jul 17 05:55 pkg # pwd /home/ports/lang/python3/3.2 # make regress ===> 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 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 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 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 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 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). # ls -l total 20 drwxr-xr-x 2 root wheel 512 Jul 12 05:01 CVS -rw-r--r-- 1 root wheel 174 Jul 17 05:55 Makefile -rw-r--r-- 1 root wheel 270 Jul 17 05:55 distinfo drwxr-xr-x 3 root wheel 1024 Jul 17 06:16 patches drwxr-xr-x 3 root wheel 512 Jul 17 05:55 pkg In /home/ports/pobj/Python-3.2.1 I noticed rej files with content similar to the one below: # more tempfile.py.rej @@ -139,7 +139,7 @@ if _os.name == 'nt': dirlist.extend([ r'c:\temp', r'c:\tmp', r'\temp', r'\tmp' ]) else: - dirlist.extend([ '/tmp', '/var/tmp', '/usr/tmp' ]) + dirlist.extend([ '/tmp', '/var/tmp' ]) # As a last resort, the current directory. try: # pwd /home/ports/pobj/Python-3.2.1/Python-3.2.1/Modules # ls -l *.rej -rw-r--r-- 1 root wheel 269 Jul 17 06:16 makesetup.rej -rw-r--r-- 1 root wheel 373 Jul 17 06:16 pyexpat.c.rej -rw-r--r-- 1 root wheel 1512 Jul 17 06:16 selectmodule.c.rej # cat makesetup.rej @@ -164,6 +164,7 @@ -rpath) libs="$libs $arg"; skip=libs;; --rpath) libs="$libs $arg"; skip=libs;; -[A-Zl]*) libs="$libs $arg";; + -pthread*) libs="$libs $arg";; *.a) libs="$libs $arg";; *.so) libs="$libs $arg";; *.sl) libs="$libs $arg";; # Vijay Sankar vsan...@foretell.ca