diff options
| author |   Zhang Xiao <xiao.zhang@windriver.com> | 2018-03-12 02:12:58 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-29 17:45:58 +0100 |
| commit | bbb5e55abd0e628a5b0dae90d5eace0a2483f1fc (patch) | |
| tree | 4b8aa62d4e187f17ef2bb00a7ca7067f3c149179 | |
| parent | 6f8f984ba363f764e83290b972ec31a90aad1603 (diff) | |
| download | openembedded-core-contrib-bbb5e55abd0e628a5b0dae90d5eace0a2483f1fc.tar.gz | |
python3: fix file conflict when multilib enabled
Config file python3.5m-config conflicts between 32 and 64 bit packages.
Use update-alternatives to add base_libdir as suffix to avoid it.
[YOCTO #12511]
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python/python3_3.5.5.bb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb index 4dae4fa4c6e..50f63e39c13 100644 --- a/meta/recipes-devtools/python/python3_3.5.5.bb +++ b/meta/recipes-devtools/python/python3_3.5.5.bb @@ -4,7 +4,7 @@ DEPENDS = "python3-native libffi bzip2 gdbm openssl sqlite3 zlib virtual/libintl PR = "${INC_PR}.0" PYTHON_MAJMIN = "3.5" -PYTHON_BINABI= "${PYTHON_MAJMIN}m" +PYTHON_BINABI = "${PYTHON_MAJMIN}m" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ @@ -48,7 +48,13 @@ UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" S = "${WORKDIR}/Python-${PV}" -inherit autotools multilib_header python3native pkgconfig +inherit autotools multilib_header python3native pkgconfig update-alternatives + +MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}" + +ALTERNATIVE_${PN}-dev = "python-config" +ALTERNATIVE_LINK_NAME[python-config] = "${bindir}/python${PYTHON_BINABI}-config" +ALTERNATIVE_TARGET[python-config] = "${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}" CONFIGUREOPTS += " --with-system-ffi " @@ -207,6 +213,8 @@ py_package_preprocess () { ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ -c "from py_compile import compile; compile('./${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py', optimize=2)" cd - + + mv ${PKGD}/${bindir}/python3.5m-config ${PKGD}/${bindir}/python3.5m-config-${MULTILIB_SUFFIX} } # manual dependency additions |