mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

python3: fix the installation path of libpython3.7m.a for multilib

Browse Source 
Fix the installation path of libpython3.7m.a on mulitlib lib64
platform to lib64 instead of lib

(From OE-Core rev: 3081d3993095d2e4817bbef33c9c90dd814a45d7)

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changqing Li
2020-02-07 14:07:43 +08:00
committed by Richard Purdie
parent 2d267973e0
commit e774c22381
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-devtools/python/python3/0001-configure.ac-fix-LIBPL.patch Normal file
View File

@@ -0,0 +1,35 @@
From acce3d441e7eadadd2d3ce38654155dc43f1f607 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Fri, 7 Feb 2020 09:36:25 +0800
Subject: [PATCH] configure.ac: fix LIBPL
Use LIBDIR rather than prefix/lib, so that it would work when lib64.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Li Zhou <li.zhou@windriver.c>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index ce04258..915f475 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4532,9 +4532,9 @@ fi
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
if test x$PLATFORM_TRIPLET = x; then
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
+ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}"
else
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
fi
AC_SUBST(LIBPL)
--
2.7.4

5
meta/recipes-devtools/python/python3_3.8.1.bb
View File

@@ -29,6 +29,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \ file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ file://0001-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \
file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \ file://0001-Makefile-do-not-compile-.pyc-in-parallel.patch \
file://0001-configure.ac-fix-LIBPL.patch \
" "
SRC_URI_append_class-native = " \ SRC_URI_append_class-native = " \
@@ -174,7 +175,7 @@ py_package_preprocess () {
-e 's:${RECIPE_SYSROOT_NATIVE}::g' \ -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
-e 's:${RECIPE_SYSROOT}::g' \ -e 's:${RECIPE_SYSROOT}::g' \
-e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
${PKGD}/${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}${PYTHON_ABI}*/Makefile \
${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py \
${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config ${PKGD}/${bindir}/python${PYTHON_MAJMIN}-config
@@ -322,7 +323,7 @@ RPROVIDES_${PN}-venv += "python3-pyvenv"
# package libpython3 # package libpython3
PACKAGES =+ "libpython3 libpython3-staticdev" PACKAGES =+ "libpython3 libpython3-staticdev"
FILES_libpython3 = "${libdir}/libpython*.so.*" FILES_libpython3 = "${libdir}/libpython*.so.*"
FILES_libpython3-staticdev += "${prefix}/lib/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a" FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a"
INSANE_SKIP_${PN}-dev += "dev-elf" INSANE_SKIP_${PN}-dev += "dev-elf"
# catch all the rest (unsorted) # catch all the rest (unsorted)