[oe-commits] Christopher Larson : python, python-native: fix PARALLEL_MAKEINST failure
git at git.openembedded.org
git at git.openembedded.org
Sun Feb 9 11:01:50 UTC 2014
Module: openembedded-core.git
Branch: dora
Commit: 4766c03a208f37276b4778a4edc20e1e19faebeb
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4766c03a208f37276b4778a4edc20e1e19faebeb
Author: Christopher Larson <chris_larson at mentor.com>
Date: Mon Nov 25 17:25:24 2013 +0000
python, python-native: fix PARALLEL_MAKEINST failure
When using make -j with the 'install' target, it's possible for altbininstall
(which normally creates BINDIR) and libainstall (which doesn't, though it
installs python-config there) to race, resulting in a failure due to
attempting to install python-config into a nonexistent BINDIR. Ensure it also
exists in the libainstall target.
(From OE-Core master rev: 54da47f3ddc1c009594744793060ffd09db3ad11)
Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
meta/recipes-devtools/python/python-native_2.7.3.bb | 1 +
.../python/parallel-makeinst-create-bindir.patch | 19 +++++++++++++++++++
meta/recipes-devtools/python/python_2.7.3.bb | 1 +
3 files changed, 21 insertions(+)
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index ef891b2..6b87a16 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -16,6 +16,7 @@ SRC_URI += "\
file://multilib.patch \
file://add-md5module-support.patch \
file://builddir.patch \
+ file://parallel-makeinst-create-bindir.patch \
"
S = "${WORKDIR}/Python-${PV}"
diff --git a/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch b/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
new file mode 100644
index 0000000..951cb46
--- /dev/null
+++ b/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
@@ -0,0 +1,19 @@
+When using make -j with the 'install' target, it's possible for altbininstall
+(which normally creates BINDIR) and libainstall (which doesn't, though it
+installs python-config there) to race, resulting in a failure due to
+attempting to install python-config into a nonexistent BINDIR. Ensure it also
+exists in the libainstall target.
+
+Upstream-Status: Pending
+
+--- Python-2.7.3.orig/Makefile.pre.in
++++ Python-2.7.3/Makefile.pre.in
+@@ -1008,7 +1008,7 @@ LIBPL= $(LIBP)/config
+ LIBPC= $(LIBDIR)/pkgconfig
+
+ libainstall: all python-config
+- @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \
++ @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC) $(BINDIR); \
+ do \
+ if test ! -d $(DESTDIR)$$i; then \
+ echo "Creating directory $$i"; \
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index fb7d1c9..50c7f9b 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -32,6 +32,7 @@ SRC_URI += "\
file://run-ptest \
file://CVE-2013-4073_py27.patch \
file://pypirc-secure.patch \
+ file://parallel-makeinst-create-bindir.patch \
"
S = "${WORKDIR}/Python-${PV}"
More information about the Openembedded-commits
mailing list