Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Sep 2009 17:33:51 +0200
From:      =?UTF-8?Q?Kamil_Dery=C5=84ski?= <kamil@derynski.net>
To:        Martin Wilke <miwi@freebsd.org>
Cc:        python@freebsd.org
Subject:   Re: ports/138839: lang/python26 SEM option problem
Message-ID:  <bc179c9c0909150833g5f1037c5g8f2488faa5793505@mail.gmail.com>
In-Reply-To: <20090915141436.GB69992@bsdcrew.de>
References:  <200909151313.n8FDDJ01094089@freefall.freebsd.org> <bc179c9c0909150651u734593b1qe7d7cb5ebc0c51db@mail.gmail.com> <20090915141436.GB69992@bsdcrew.de>

next in thread | previous in thread | raw e-mail | index | archive | help
2009/9/15 Martin Wilke <miwi@freebsd.org>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On Tue, Sep 15, 2009 at 03:51:59PM +0200, Kamil Dery??ski wrote:
>> 2009/9/15 =C2=A0<miwi@freebsd.org>:
>> > Synopsis: lang/python26 SEM option problem
>> >
>> > State-Changed-From-To: open->feedback
>> > State-Changed-By: miwi
>> > State-Changed-When: Tue Sep 15 13:13:01 UTC 2009
>> > State-Changed-Why:
>> >
>> > Please test following patch:
>> >
>> > http://tmp.chruetertee.ch/python26-sem-hack.patch
>> >
>> >
>> > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D138839
>> >
>>
>> I apply this patch. I get following error:
>>
>> =3D=3D=3D> =C2=A0Applying FreeBSD patches for python26-2.6.2_3
>> 1 out of 11 hunks failed--saving rejects to setup.py.rej
>> =3D> Patch patch-setup.py failed to apply cleanly.
>> =3D> Patch(es) patch-Lib_test_test_threading.py
>> patch-Modules-_ctypes-libffi-configure patch-Python2.6-Lib_local.py
>> patch-Python_thread__pthread.h applied cleanly.
>> *** Error code 1
>>
>
> yes please drop befor you work dir and rerun

It doesn't work. Patch apply cleanly.

bsd# patch < python26-sem-hack.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: Makefile
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /home/pcvs/ports/lang/python26/Makefile,v
|retrieving revision 1.163
|diff -u -r1.163 Makefile
|--- Makefile   11 Sep 2009 14:58:08 -0000      1.163
|+++ Makefile   15 Sep 2009 11:38:46 -0000
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 62.
Hunk #2 succeeded at 181.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: files/extra-patch-setup.py
|=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|RCS file: /home/pcvs/ports/lang/python26/files/extra-patch-setup.py,v
|retrieving revision 1.2
|diff -u -r1.2 extra-patch-setup.py
|--- files/extra-patch-setup.py 11 Sep 2009 14:58:08 -0000      1.2
|+++ files/extra-patch-setup.py 15 Sep 2009 11:35:40 -0000
--------------------------
Patching file files/extra-patch-setup.py using Plan A...
Hunk #1 succeeded at 4.
done

After that when I build, I get the same error.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bc179c9c0909150833g5f1037c5g8f2488faa5793505>