Patchwork [1/1] python: fix failures of LSB python-runtime tests

login
register
mail settings
Submitter Hongxu Jia
Date Sept. 14, 2013, 4:31 a.m.
Message ID <9bafb39aaaf33a7a3eee1e20ca2beca8378df3c8.1379132723.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/58039/
State Accepted
Commit e3cacf17e81b3b9571c9685bad389cc951a496ec
Headers show

Comments

Hongxu Jia - Sept. 14, 2013, 4:31 a.m.
It has been fixed in:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e261c1760d8a660c13cd00039a4812d51f47f3df

But there is a typo in:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=78ac027f2ac6c6663fff7080eabbd3d09c1241bb
It missed to remove an extra "--with-wctype-functions" in EXTRA_OECONF

[YOCTO #5154]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-devtools/python/python.inc | 1 -
 1 file changed, 1 deletion(-)
Saul Wold - Sept. 15, 2013, 8:52 p.m.
On 09/13/2013 09:31 PM, Hongxu Jia wrote:
> It has been fixed in:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e261c1760d8a660c13cd00039a4812d51f47f3df
>
> But there is a typo in:
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=78ac027f2ac6c6663fff7080eabbd3d09c1241bb
> It missed to remove an extra "--with-wctype-functions" in EXTRA_OECONF
>
> [YOCTO #5154]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   meta/recipes-devtools/python/python.inc | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
> index 80609a8..fcfeda5 100644
> --- a/meta/recipes-devtools/python/python.inc
> +++ b/meta/recipes-devtools/python/python.inc
> @@ -25,7 +25,6 @@ EXTRA_OECONF = "\
>     --with-cyclic-gc \
>     --without-cxx \
>     --with-signal-module \
> -  --with-wctype-functions \
I think this needs to be protected with a linuxstdbase check.

Sau!

>     --enable-shared \
>     --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
>     ${PYTHONLSBOPTS} \
>
Hongxu Jia - Sept. 16, 2013, 1:33 a.m.
On 09/16/2013 04:52 AM, Saul Wold wrote:
> On 09/13/2013 09:31 PM, Hongxu Jia wrote:
>> It has been fixed in:
>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e261c1760d8a660c13cd00039a4812d51f47f3df 
>>
>>
>> But there is a typo in:
>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=78ac027f2ac6c6663fff7080eabbd3d09c1241bb 
>>
>> It missed to remove an extra "--with-wctype-functions" in EXTRA_OECONF
>>
>> [YOCTO #5154]
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> ---
>>   meta/recipes-devtools/python/python.inc | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/python/python.inc 
>> b/meta/recipes-devtools/python/python.inc
>> index 80609a8..fcfeda5 100644
>> --- a/meta/recipes-devtools/python/python.inc
>> +++ b/meta/recipes-devtools/python/python.inc
>> @@ -25,7 +25,6 @@ EXTRA_OECONF = "\
>>     --with-cyclic-gc \
>>     --without-cxx \
>>     --with-signal-module \
>> -  --with-wctype-functions \
> I think this needs to be protected with a linuxstdbase check.
>

http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=78ac027f2ac6c6663fff7080eabbd3d09c1241bb
has done this, but missing to remove the extra ' --with-wctype-functions'

inherit autotools

+PYTHONLSBOPTS = "--with-wctype-functions"
+PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8"
+
  EXTRA_OECONF = "\
    --with-threads \
    --with-pymalloc \
@@ -24,14 +27,5 @@ EXTRA_OECONF = "\
    --with-signal-module \
    --with-wctype-functions \
    --enable-shared \
-"
-
-EXTRA_OECONF_linuxstdbase = "\
-  --with-threads \
-  --with-pymalloc \
-  --with-cyclic-gc \
-  --without-cxx \
-  --with-signal-module \
-  --enable-shared \
-  ac_cv_sizeof_off_t=8 \
+  ${PYTHONLSBOPTS} \
  "

//Hongxu



> Sau!
>
>>     --enable-shared \
>>     --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 
>> 'no', d)} \
>>     ${PYTHONLSBOPTS} \
>>
Saul Wold - Sept. 16, 2013, 3:05 a.m.
On 09/15/2013 06:33 PM, Hongxu Jia wrote:
> On 09/16/2013 04:52 AM, Saul Wold wrote:
>> On 09/13/2013 09:31 PM, Hongxu Jia wrote:
>>> It has been fixed in:
>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e261c1760d8a660c13cd00039a4812d51f47f3df
>>>
>>>
>>> But there is a typo in:
>>> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=78ac027f2ac6c6663fff7080eabbd3d09c1241bb
>>>
>>> It missed to remove an extra "--with-wctype-functions" in EXTRA_OECONF
>>>
>>> [YOCTO #5154]
>>>
>>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>>> ---
>>>   meta/recipes-devtools/python/python.inc | 1 -
>>>   1 file changed, 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-devtools/python/python.inc
>>> b/meta/recipes-devtools/python/python.inc
>>> index 80609a8..fcfeda5 100644
>>> --- a/meta/recipes-devtools/python/python.inc
>>> +++ b/meta/recipes-devtools/python/python.inc
>>> @@ -25,7 +25,6 @@ EXTRA_OECONF = "\
>>>     --with-cyclic-gc \
>>>     --without-cxx \
>>>     --with-signal-module \
>>> -  --with-wctype-functions \
>> I think this needs to be protected with a linuxstdbase check.
>>
>
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=78ac027f2ac6c6663fff7080eabbd3d09c1241bb
> has done this, but missing to remove the extra ' --with-wctype-functions'
>
Sorry, I rushed the review of this and did not look at the big picture. 
  Your patch seems correct.

Sau!

> inherit autotools
>
> +PYTHONLSBOPTS = "--with-wctype-functions"
> +PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8"
> +
>   EXTRA_OECONF = "\
>     --with-threads \
>     --with-pymalloc \
> @@ -24,14 +27,5 @@ EXTRA_OECONF = "\
>     --with-signal-module \
>     --with-wctype-functions \
>     --enable-shared \
> -"
> -
> -EXTRA_OECONF_linuxstdbase = "\
> -  --with-threads \
> -  --with-pymalloc \
> -  --with-cyclic-gc \
> -  --without-cxx \
> -  --with-signal-module \
> -  --enable-shared \
> -  ac_cv_sizeof_off_t=8 \
> +  ${PYTHONLSBOPTS} \
>   "
>
> //Hongxu
>
>
>
>> Sau!
>>
>>>     --enable-shared \
>>>     --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes',
>>> 'no', d)} \
>>>     ${PYTHONLSBOPTS} \
>>>
>

Patch

diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 80609a8..fcfeda5 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -25,7 +25,6 @@  EXTRA_OECONF = "\
   --with-cyclic-gc \
   --without-cxx \
   --with-signal-module \
-  --with-wctype-functions \
   --enable-shared \
   --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
   ${PYTHONLSBOPTS} \