Skip to contentSkip to conversation

python: fix failures of LSB python-runtime tests

PATCH In review Hongxu Jia 2 participants 5 messages Sep 14, 2013 – Sep 16, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover python: fix failures of LSB python-runtime tests

The following changes since commit dd36930f3f37b2e0e1258de28ac1b1fa99cf196f:

bitbake: data_smart: Account for changes in append/prepend/remove in the config hash (2013-09-12 17:03:17 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-lsb-python
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-lsb-python

Hongxu Jia (1):
python: fix failures of LSB python-runtime tests

 meta/recipes-devtools/python/python.inc | 1 -
 1 file changed, 1 deletion(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 python: fix failures of LSB python-runtime tests

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]

---
 meta/recipes-devtools/python/python.inc | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-devtools/python/python.inc +0 -1
index 80609a8..fcfeda5 100644
@@ -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} \
Signature · 1 line
1.8.1.2
#2 lore raw
Quoted 19 lines · Hongxu Jia

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]

---
  meta/recipes-devtools/python/python.inc | 1 -
  1 file changed, 1 deletion(-)
meta/recipes-devtools/python/python.inc +0 -0
index 80609a8..fcfeda5 100644

meta/recipes-devtools/python/python.inc EXTRA_OECONF = "\ · line 28

Quoted 4 lines
meta/recipes-devtools/python/python.inc +0 -1
@@ -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!

Quoted 4 lines
meta/recipes-devtools/python/python.inc +0 -0
    --enable-shared \
    --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
    ${PYTHONLSBOPTS} \
author
#3 lore raw
Quoted 17 lines · Saul Wold
Quoted 16 lines · Hongxu Jia

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]

---
  meta/recipes-devtools/python/python.inc | 1 -
  1 file changed, 1 deletion(-)
Quoted 11 lines

meta/recipes-devtools/python/python.inc EXTRA_OECONF = "\ · line 28

Quoted 9 lines
meta/recipes-devtools/python/python.inc +0 -1
index 80609a8..fcfeda5 100644
@@ -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

Quoted 7 lines

Sau!

Quoted 5 lines
meta/recipes-devtools/python/python.inc +0 -0
    --enable-shared \
    --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 
 'no', d)} \
    ${PYTHONLSBOPTS} \
#4 lore raw
Quoted 31 lines · Hongxu Jia
Quoted 17 lines · Saul Wold
Quoted 16 lines · Hongxu Jia

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]

---
  meta/recipes-devtools/python/python.inc | 1 -
  1 file changed, 1 deletion(-)
Quoted 12 lines

meta/recipes-devtools/python/python.inc EXTRA_OECONF = "\ · line 28

Quoted 10 lines
meta/recipes-devtools/python/python.inc +0 -1
index 80609a8..fcfeda5 100644
@@ -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.

Quoted 3 lines

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!

Quoted 37 lines

inherit autotools

(quoted diff) +4 -10
+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

Quoted 7 lines

Sau!

Quoted 5 lines
meta/recipes-devtools/python/python.inc +0 -0
    --enable-shared \
    --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes',
 'no', d)} \
    ${PYTHONLSBOPTS} \