diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2013-11-25 17:25:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-03 17:11:16 +0000 |
| commit | 54da47f3ddc1c009594744793060ffd09db3ad11 (patch) | |
| tree | 07154c18ebfe0fbb2c2627d81fe83d7a0712e5e0 /meta/recipes-devtools/python | |
| parent | 16bbdef239942276a1740a3b9dfe4e8c34a16b29 (diff) | |
| download | openembedded-core-54da47f3ddc1c009594744793060ffd09db3ad11.tar.gz openembedded-core-54da47f3ddc1c009594744793060ffd09db3ad11.tar.bz2 openembedded-core-54da47f3ddc1c009594744793060ffd09db3ad11.zip | |
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.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
3 files changed, 21 insertions, 0 deletions
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 ef891b246c..6b87a16d41 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 0000000000..951cb466ff --- /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 b560b82754..340f5f330f 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}" |