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:45:53 +0000 |
commit | 1bc64bae2f72046dfb4b16f23333827171784af5 (patch) | |
tree | e3b82caf77d1fe9fcfcbe443d66270657df7de07 /meta/recipes-devtools/python/python | |
parent | 82e373fb847b08b55176d0bcd78fdebf1c1b8689 (diff) | |
download | poky-1bc64bae2f72046dfb4b16f23333827171784af5.tar.gz |
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 rev: 54da47f3ddc1c009594744793060ffd09db3ad11)
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/python')
-rw-r--r-- | meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch | 19 |
1 files changed, 19 insertions, 0 deletions
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 @@ | |||
1 | When using make -j with the 'install' target, it's possible for altbininstall | ||
2 | (which normally creates BINDIR) and libainstall (which doesn't, though it | ||
3 | installs python-config there) to race, resulting in a failure due to | ||
4 | attempting to install python-config into a nonexistent BINDIR. Ensure it also | ||
5 | exists in the libainstall target. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- Python-2.7.3.orig/Makefile.pre.in | ||
10 | +++ Python-2.7.3/Makefile.pre.in | ||
11 | @@ -1008,7 +1008,7 @@ LIBPL= $(LIBP)/config | ||
12 | LIBPC= $(LIBDIR)/pkgconfig | ||
13 | |||
14 | libainstall: all python-config | ||
15 | - @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ | ||
16 | + @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC) $(BINDIR); \ | ||
17 | do \ | ||
18 | if test ! -d $(DESTDIR)$$i; then \ | ||
19 | echo "Creating directory $$i"; \ | ||