diff options
| -rw-r--r-- | classes/distutils.bbclass | 6 | ||||
| -rw-r--r-- | packages/python/python-native-2.5.1/fix-staging.patch | 38 | ||||
| -rw-r--r-- | packages/python/python-native_2.5.1.bb | 8 |
3 files changed, 49 insertions, 3 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index a35ca27bd4..694d6bc5d9 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -8,6 +8,8 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ --install-data=${D}/${datadir}" distutils_do_compile() { + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ oefatal "python setup.py build_ext execution failed." @@ -21,6 +23,8 @@ distutils_stage_headers() { } distutils_stage_all() { + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ install -d ${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages PYTHONPATH=${STAGING_DIR_HOST}${layout_libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ @@ -30,6 +34,8 @@ distutils_stage_all() { distutils_do_install() { install -d ${D}${libdir}/${PYTHON_DIR}/site-packages + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ diff --git a/packages/python/python-native-2.5.1/fix-staging.patch b/packages/python/python-native-2.5.1/fix-staging.patch new file mode 100644 index 0000000000..087c813fd4 --- /dev/null +++ b/packages/python/python-native-2.5.1/fix-staging.patch @@ -0,0 +1,38 @@ +--- + Lib/distutils/sysconfig.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +--- Python-2.5.1.orig/Lib/distutils/sysconfig.py ++++ Python-2.5.1/Lib/distutils/sysconfig.py +@@ -52,11 +52,14 @@ def get_python_inc(plat_specific=0, pref + + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ + if prefix is None: +- prefix = plat_specific and EXEC_PREFIX or PREFIX ++ if plat_specific: ++ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') ++ else: ++ prefix = plat_specific and EXEC_PREFIX or PREFIX + if os.name == "posix": + if python_build: + base = os.path.dirname(os.path.abspath(sys.executable)) + if plat_specific: + inc_dir = base +@@ -94,11 +97,14 @@ def get_python_lib(plat_specific=0, stan + + If 'prefix' is supplied, use it instead of sys.prefix or + sys.exec_prefix -- i.e., ignore 'plat_specific'. + """ + if prefix is None: +- prefix = plat_specific and EXEC_PREFIX or PREFIX ++ if plat_specific: ++ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') ++ else: ++ prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": + libpython = os.path.join(prefix, + "lib", "python" + get_python_version()) + if standard_lib: diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb index 3f58d36a2e..d43cb520cb 100644 --- a/packages/python/python-native_2.5.1.bb +++ b/packages/python/python-native_2.5.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "The Python Programming Language" HOMEPAGE = "http://www.python.org" LICENSE = "PSF" +DEPENDS = "openssl-native bzip2-full-native" SECTION = "devel/python" PRIORITY = "optional" -DEPENDS = "" -PR = "ml2" +PR = "ml5" EXCLUDE_FROM_WORLD = "1" @@ -15,6 +15,7 @@ SRC_URI = "\ file://dont-modify-shebang-line.patch;patch=1 \ file://default-is-optimized.patch;patch=1 \ file://catchup-with-swig.patch;patch=1 \ + file://fix-staging.patch;patch=1 \ " S = "${WORKDIR}/Python-${PV}" @@ -25,7 +26,8 @@ exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ --without-cxx --with-signal-module --with-wctype-functions" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ + STAGING_INCDIR=${STAGING_INCDIR}' do_stage_append() { install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ |