sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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)

(From OE-Core rev: 4766c03a208f37276b4778a4edc20e1e19faebeb)

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>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Christopher Larson 2013-11-25 17:25:24 +00:00 committed by Richard Purdie
parent 1ed91fcd03
commit ccbdac5d97
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/python/python-native_2.7.3.bb
View File

@ -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}"

19
meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch Normal file
View File

@ -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"; \

1
meta/recipes-devtools/python/python_2.7.3.bb
View File

@ -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}"