summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMichael Lippautz <michael.lippautz@gmail.com>2011-05-03 18:40:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 15:06:34 +0100
commitb5adb300dda792d128e9d1a7c33646437dbe73e4 (patch)
tree276d40e0b035a6016ac60c9e403f40d952e01074 /meta
parentd2e078aa046ae6c4f169695f546cf229db5be1f7 (diff)
downloadpoky-b5adb300dda792d128e9d1a7c33646437dbe73e4.tar.gz
python: Unbreak Python third-party extensions
This patch fixes compilation/linking of python third-party extensions, i.e. Extensions that ship with C code. Problem: Python uses distutils(-native) to compile third-party extensions. distutils uses its own sysconfig module to get the options for compiling and linking. Since third-party extensions have to be linked against this libpython it important that -L points into staging. This is not the case because distutils.sysconfig uses a special Makefile that is shipped with python determine the paths. The Makefile is the same that would be used on the target to build third-party extensions. It therefore points into /usr/lib instead of staging. Solution: Stage a modified version of the Makefile where the paths (incdir, libdir) have been replaced by ones that point into staging. Side-problem: The recipe actually should not stage files itself in do_compile, but rather handle everything that needs to be staged in do_install. This is currently not possible because python compiles itself using distutils-native. Distutils on the other hand does only allow to add a path, but not to substitute it, requiring a staged Makefile and libpython.so before the actual python compilation is triggered. The second step to solve this would be to either patch distutils, or split python into python-initial and python. The -initial part could create the Makefile and the library, while the main part focuses on the target. For further references see: http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/001752.html (From OE-Core rev: 413e7e5a5d6db45a6fbca5044246d6696d9d5711) Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com> Acked-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb41
1 files changed, 27 insertions, 14 deletions
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index a641ddd617..65875ff34a 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" 3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
4PR = "${INC_PR}.2" 4PR = "${INC_PR}.3"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
6 6
7DISTRO_SRC_URI ?= "file://sitecustomize.py" 7DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -34,23 +34,26 @@ do_configure_prepend() {
34 autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf" 34 autoreconf -Wcross --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf"
35} 35}
36 36
37# 37do_compile() {
38# Copy config.h and an appropriate Makefile for distutils.sysconfig, 38 #
39# which laters uses the information out of these to compile extensions 39 # Copy config.h and an appropriate Makefile for distutils.sysconfig,
40# 40 # which laters uses the information out of these to compile extensions
41do_compile_prepend() { 41 #
42 # The following part (until python compilation) should probably moved to an
43 # -initial recipe to handle staging better
44 #
42 install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ 45 install -d ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
43 install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ 46 install -d ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
44 install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/ 47 install -m 0644 pyconfig.h ${STAGING_INCDIR}/python${PYTHON_MAJMIN}/
48
49 # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144
50 sed -i -e s,ccache,'$(CCACHE)', Makefile
51
45 install -m 0644 Makefile Makefile.orig 52 install -m 0644 Makefile Makefile.orig
46 install -m 0644 Makefile Makefile.backup 53 sed -i -e 's,${includedir},${STAGING_INCDIR},' Makefile
47 sed -e 's,${includedir},${STAGING_INCDIR},' < Makefile.backup > Makefile 54 sed -i -e 's,${libdir},${STAGING_LIBDIR},' Makefile
48 install -m 0644 Makefile Makefile.backup
49 sed -e 's,${libdir},${STAGING_LIBDIR},' < Makefile.backup > Makefile
50 install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/ 55 install -m 0644 Makefile ${STAGING_LIBDIR}/python${PYTHON_MAJMIN}/config/
51}
52 56
53do_compile() {
54 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ 57 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
55 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \ 58 HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
56 STAGING_LIBDIR=${STAGING_LIBDIR} \ 59 STAGING_LIBDIR=${STAGING_LIBDIR} \
@@ -69,6 +72,9 @@ do_compile() {
69} 72}
70 73
71do_install() { 74do_install() {
75 # make install needs the original Makefile, or otherwise the inclues would
76 # go to ${D}${STAGING...}/...
77 install -m 0644 Makefile Makefile.sysroot
72 install -m 0644 Makefile.orig Makefile 78 install -m 0644 Makefile.orig Makefile
73 79
74 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \ 80 oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
@@ -78,12 +84,19 @@ do_install() {
78 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 84 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
79 DESTDIR=${D} LIBDIR=${libdir} install 85 DESTDIR=${D} LIBDIR=${libdir} install
80 86
87 install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
88 rm Makefile.sysroot
89
81 if [ -e ${WORKDIR}/sitecustomize.py ]; then 90 if [ -e ${WORKDIR}/sitecustomize.py ]; then
82 install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN} 91 install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
83 fi 92 fi
93}
84 94
85 # remove hardcoded ccache, see http://bugs.openembedded.net/show_bug.cgi?id=4144 95PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
86 sed -i -e s,ccache,'$(CCACHE)', ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile 96
97py_package_preprocess () {
98 # copy back the old Makefile to fix target package
99 install -m 0644 Makefile.orig ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
87} 100}
88 101
89require python-${PYTHON_MAJMIN}-manifest.inc 102require python-${PYTHON_MAJMIN}-manifest.inc