Enable python support for libnewt and libuser

PATCH In review Kang Kai 2 participants 5 messages Dec 6, 2012 – Dec 7, 2012

lore

Share & tools

lore

Kang Kai

author

2012-12-06 08:30 UTC #0 lore raw

cover Enable python support for libnewt and libuser

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

Signature · 1 line

1.7.5.4

Kang Kai

author

2012-12-06 08:30 UTC #1 lore raw

PATCH 1/2 newt: enable python support

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

Signed-off-by Kang Kai <[email protected]>

---
 .../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

meta/recipes-extended/newt/files/fix_python_fpic.patch new file +11 -0

new file mode 100644
index 0000000..d0dbe99
@@ -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 $@

meta/recipes-extended/newt/libnewt_0.52.14.bb +17 -5

index 0208695..84eba4d 100644
@@ -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"

Signature · 1 line

1.7.5.4

Kang Kai

author

2012-12-06 08:30 UTC #2 lore raw

PATCH 2/2 libuser: enable python support

In reply to Kang Kai

Compile libuser with python support.

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-extended/libuser/libuser_0.57.1.bb |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

meta/recipes-extended/libuser/libuser_0.57.1.bb +9 -3

index 99b661b..3a29695 100644
@@ -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

Signature · 1 line

1.7.5.4

Saul Wold

2012-12-07 01:01 UTC #3 lore raw

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

Quoted 15 lines · Kang Kai

Compile libuser with python support.

Signed-off-by Kang Kai <[email protected]>

---
  meta/recipes-extended/libuser/libuser_0.57.1.bb |   12 +++++++++---
  1 files changed, 9 insertions(+), 3 deletions(-)

meta/recipes-extended/libuser/libuser_0.57.1.bb +0 -0

index 99b661b..3a29695 100644
@@ -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"

meta/recipes-extended/libuser/libuser_0.57.1.bb SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz" · line 25

Quoted 10 lines

meta/recipes-extended/libuser/libuser_0.57.1.bb +5 -2

-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!

Quoted 7 lines

meta/recipes-extended/libuser/libuser_0.57.1.bb +4 -1

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

Kang Kai

author

2012-12-07 07:00 UTC #4 lore raw

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

Quoted 22 lines · Saul Wold

Quoted 21 lines · Kang Kai
Compile libuser with python support.
Signed-off-by Kang Kai <[email protected]>
---
meta/recipes-extended/libuser/libuser_0.57.1.bb | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
meta/recipes-extended/libuser/libuser_0.57.1.bb +0 -0
index 99b661b..3a29695 100644
@@ -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"
meta/recipes-extended/libuser/libuser_0.57.1.bb +1 -1
-PR = "r2"
+PR = "r3"
DEPENDS = "popt libpam glib-2.0 xz-native docbook-utils-native linuxdoc-tools-native"

Quoted 8 lines

meta/recipes-extended/libuser/libuser_0.57.1.bb SRC_URI = "https://fedorahosted.org/releases/l/i/libuser/libuser-${PV}.tar.xz" · line 25
Quoted 5 lines
meta/recipes-extended/libuser/libuser_0.57.1.bb +4 -1
-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

Quoted 12 lines

Thanks
Sau!

Quoted 7 lines

meta/recipes-extended/libuser/libuser_0.57.1.bb +4 -1

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