[PATCH 0/2] Enable python support for libnewt and libuser

[PATCH 0/2] Enable python support for libnewt and libuser

[Kang Kai]

Other packages may need libnewt and libuser's python extension, so enable python support for them.

The following changes since commit 5b027d041ae994d02e22302dbbf3685484aa9b48:

  gst-meta-base: pull in X11 plugins when using X11 (2012-12-05 15:26:42 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib kangkai/libuser_newt-with-python
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/libuser_newt-with-python

Kang Kai (2):
  newt: enable python support
  libuser: enable python support

 meta/recipes-extended/libuser/libuser_0.57.1.bb    |   12 ++++++++--
 .../newt/files/fix_python_fpic.patch               |   11 ++++++++++
 meta/recipes-extended/newt/libnewt_0.52.14.bb      |   22 +++++++++++++++----
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-extended/newt/files/fix_python_fpic.patch

-- 
1.7.5.4

[PATCH 1/2] newt: enable python support

[Kang Kai]

Compile newt with python support. There may be packages that need newt's
python extension.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 .../newt/files/fix_python_fpic.patch               |   11 ++++++++++
 meta/recipes-extended/newt/libnewt_0.52.14.bb      |   22 +++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-extended/newt/files/fix_python_fpic.patch

diff --git a/meta/recipes-extended/newt/files/fix_python_fpic.patch b/meta/recipes-extended/newt/files/fix_python_fpic.patch
new file mode 100644
index 0000000..d0dbe99
--- /dev/null
+++ b/meta/recipes-extended/newt/files/fix_python_fpic.patch
@@ -0,0 +1,11 @@
+--- newt-0.52.14/Makefile.in	2012-12-04 17:27:27.578915801 +0800
++++ newt-0.52.14/Makefile.in.new	2012-12-04 17:28:43.274918472 +0800
+@@ -84,7 +84,7 @@
+ 			PIFLAGS=`$$ver-config --includes`; \
+ 			PLDFLAGS=`$$ver-config --ldflags`; \
+ 			PLFLAGS=`$$ver-config --libs`; \
+-	        $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
++	        $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\
+ 	        $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L.  -lnewt $(LIBS);\
+ 	done || :
+ 	touch $@
diff --git a/meta/recipes-extended/newt/libnewt_0.52.14.bb b/meta/recipes-extended/newt/libnewt_0.52.14.bb
index 0208695..84eba4d 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.14.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.14.bb
@@ -17,26 +17,38 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 # slang needs to be >= 2.2
 DEPENDS = "slang popt"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \
            file://remove_slang_include.patch \
            file://fix_SHAREDDIR.patch \
-           file://cross_ar.patch"
+           file://cross_ar.patch \
+           file://fix_python_fpic.patch"
 
 SRC_URI[md5sum] = "eb78c6bb658b92ec7198908b5b8d0e37"
 SRC_URI[sha256sum] = "f70f4f58baa60388ddf2e39249ffb00898fb40f2b2767e42e2ab51fe4b40978e"
 
 S = "${WORKDIR}/newt-${PV}"
 
-EXTRA_OECONF = "--without-python --without-tcl"
+EXTRA_OECONF = "--without-tcl"
 
-inherit autotools
+inherit autotools pythonnative python-dir
 
-PACKAGES_prepend = "whiptail "
+EXTRA_OEMAKE = "PYTHONVERS=${PYTHON_DIR}"
+
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+export BUILD_SYS
+export HOST_SYS
+
+PACKAGES_prepend = "whiptail ${PN}-python "
 
 do_configure_prepend() {
     sh autogen.sh
 }
 
 FILES_whiptail = "${bindir}/whiptail"
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
+FILES_${PN}-staticdev = "${libdir}/*.a"
-- 
1.7.5.4

[PATCH 2/2] libuser: enable python support

[Kang Kai]

Compile libuser with python support.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/libuser/libuser_0.57.1.bb |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.57.1.bb
index 99b661b..3a29695 100644
--- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
+++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
@@ -15,10 +15,16 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
 
 SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
 SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
 
-EXTRA_OECONF += "--without-python"
+inherit autotools gettext pythonnative python-dir
+
+EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}"
+
+PACKAGES += "${PN}-python "
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
 
-inherit autotools gettext
-- 
1.7.5.4

Re: [PATCH 2/2] libuser: enable python support

[Saul Wold]

On 12/06/2012 12:16 AM, Kang Kai wrote:
> Compile libuser with python support.
>
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>   meta/recipes-extended/libuser/libuser_0.57.1.bb |   12 +++++++++---
>   1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.57.1.bb
> index 99b661b..3a29695 100644
> --- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
> +++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
> @@ -15,10 +15,16 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
>
>   SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
>   SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
> -PR = "r2"
> +PR = "r3"
>
>   DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
>
> -EXTRA_OECONF += "--without-python"
> +inherit autotools gettext pythonnative python-dir
> +
> +EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}"
> +
This change seems to have a problem with the non-gplv3, possibly some 
library or newer api is needed by the python code.

Please review, you might need a wrapper with INCOMPATIBLE_LICENSE check 
for enabling or disabling the python.

Thanks
    Sau!

> +PACKAGES += "${PN}-python "
> +
> +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
> +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
>
> -inherit autotools gettext
>

Re: [PATCH 2/2] libuser: enable python support

[Kang Kai]

On 2012年12月07日 08:46, Saul Wold wrote:
> On 12/06/2012 12:16 AM, Kang Kai wrote:
>> Compile libuser with python support.
>>
>> Signed-off-by: Kang Kai <kai.kang@windriver.com>
>> ---
>> meta/recipes-extended/libuser/libuser_0.57.1.bb | 12 +++++++++---
>> 1 files changed, 9 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb 
>> b/meta/recipes-extended/libuser/libuser_0.57.1.bb
>> index 99b661b..3a29695 100644
>> --- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
>> +++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
>> @@ -15,10 +15,16 @@ SRC_URI = 
>> "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
>>
>> SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
>> SRC_URI[sha256sum] = 
>> "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
>> -PR = "r2"
>> +PR = "r3"
>>
>> DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native 
>> linuxdoc-tools-native"
>>
>> -EXTRA_OECONF += "--without-python"
>> +inherit autotools gettext pythonnative python-dir
>> +
>> +EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}"
>> +
> This change seems to have a problem with the non-gplv3, possibly some 
> library or newer api is needed by the python code.
>
> Please review, you might need a wrapper with INCOMPATIBLE_LICENSE 
> check for enabling or disabling the python.

Sorry for missing test on non-gplv3, I will update and send V2 after 
test on non-gplv3 image.

Regards,
Kai

>
> Thanks
> Sau!
>
>> +PACKAGES += "${PN}-python "
>> +
>> +FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
>> +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
>>
>> -inherit autotools gettext
>>
>

[PATCH 2/2] libuser: enable python support

[Kang Kai]

Compile libuser with python support and add python to DEPENDS.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/libuser/libuser_0.57.1.bb |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.57.1.bb
index 99b661b..105bacf 100644
--- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
+++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
@@ -15,10 +15,16 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
 
 SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
 SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
+DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python"
 
-EXTRA_OECONF += "--without-python"
+inherit autotools gettext pythonnative python-dir
+
+EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}"
+
+PACKAGES += "${PN}-python "
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
 
-inherit autotools gettext
-- 
1.7.5.4

[PATCH 2/2] libuser: enable python support

[Kang Kai]

Compile libuser with python support and add python to DEPENDS.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-extended/libuser/libuser_0.57.1.bb |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/libuser/libuser_0.57.1.bb b/meta/recipes-extended/libuser/libuser_0.57.1.bb
index 99b661b..105bacf 100644
--- a/meta/recipes-extended/libuser/libuser_0.57.1.bb
+++ b/meta/recipes-extended/libuser/libuser_0.57.1.bb
@@ -15,10 +15,16 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz"
 
 SRC_URI[md5sum] = "be82c6941264d0b4bd04f95fb342ec7d"
 SRC_URI[sha256sum] = "a61289867581fa715354a3fafe09c3e481173ce0a2dcb33b04588b6ac13cead5"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"
+DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native python"
 
-EXTRA_OECONF += "--without-python"
+inherit autotools gettext pythonnative python-dir
+
+EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}"
+
+PACKAGES += "${PN}-python "
+
+FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug"
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
 
-inherit autotools gettext
-- 
1.7.5.4