summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-12-29 17:39:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:17 +0000
commit29d273fdba7d2a02f575062edb5a4d04e320dce8 (patch)
treea25622268e756be32c6fff9e6762df748708ced0
parentdb7cee691e4cfd01f9d04f183f7fc2239c972719 (diff)
downloadpoky-29d273fdba7d2a02f575062edb5a4d04e320dce8.tar.gz
python3: fix installed-vs-shipped when 64bit + multilib
Fixed: python3-3.5.0: python3: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/python3.5 /usr/lib/python3.5/config-3.5m /usr/lib/python3.5/config-3.5m/python.o /usr/lib/python3.5/config-3.5m/Setup.local /usr/lib/python3.5/config-3.5m/Setup /usr/lib/python3.5/config-3.5m/python-config.py /usr/lib/python3.5/config-3.5m/install-sh /usr/lib/python3.5/config-3.5m/config.c.in /usr/lib/python3.5/config-3.5m/makesetup /usr/lib/python3.5/config-3.5m/Setup.config /usr/lib/python3.5/config-3.5m/config.c /usr/lib/python3.5/config-3.5m/Makefile /usr/lib/python3.5/config-3.5m/libpython3.5m.a Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. python3: 14 installed and not shipped files. [installed-vs-shipped] (From OE-Core rev: 8a96dbe5dd44e1c80aef7b8efe5820dee96a5bd7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch30
-rw-r--r--meta/recipes-devtools/python/python3_3.5.0.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch b/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch
new file mode 100644
index 0000000000..97214f9aa4
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch
@@ -0,0 +1,30 @@
1From 7c4f8d87473d6238c120ec6031b58f83a17a39a5 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 28 Dec 2015 22:52:06 -0800
4Subject: [PATCH] configure.ac: fix LIBPL
5
6Use LIBDIR rather than prefix/lib, so that it would work when lib64.
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 63aef8e..aefb27f 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -4366,7 +4366,7 @@ AC_MSG_RESULT($LDVERSION)
20
21 dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
22 AC_SUBST(PY_ENABLE_SHARED)
23-LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
24+LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}"
25 AC_SUBST(LIBPL)
26
27 # Check whether right shifting a negative integer extends the sign bit
28--
291.7.9.5
30
diff --git a/meta/recipes-devtools/python/python3_3.5.0.bb b/meta/recipes-devtools/python/python3_3.5.0.bb
index a5663a1e25..d5e26ff764 100644
--- a/meta/recipes-devtools/python/python3_3.5.0.bb
+++ b/meta/recipes-devtools/python/python3_3.5.0.bb
@@ -37,6 +37,7 @@ SRC_URI += "\
37 file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ 37 file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
38 file://setup.py-find-libraries-in-staging-dirs.patch \ 38 file://setup.py-find-libraries-in-staging-dirs.patch \
39 file://use_packed_importlib.patch \ 39 file://use_packed_importlib.patch \
40 file://configure.ac-fix-LIBPL.patch \
40 " 41 "
41SRC_URI[md5sum] = "d149d2812f10cbe04c042232e7964171" 42SRC_URI[md5sum] = "d149d2812f10cbe04c042232e7964171"
42SRC_URI[sha256sum] = "d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91" 43SRC_URI[sha256sum] = "d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91"