| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From 840fda32c82550259d02a7a56a78a9c05162b1a1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Wed, 8 May 2019 16:10:29 +0800 |
| 4 | Subject: [PATCH] Makefile: fix Issue36464 (parallel build race problem) |
| 5 | |
| 6 | When using make -j with the 'install' target, it's possible for altbininstall |
| 7 | (which normally creates BINDIR) and libainstall (which doesn't, though it |
| 8 | installs python-config there) to race, resulting in a failure due to |
| 9 | attempting to install python-config into a nonexistent BINDIR. Ensure it also |
| 10 | exists in the libainstall target. |
| 11 | |
| 12 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/13186] |
| 13 | |
| 14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 15 | --- |
| 16 | Makefile.pre.in | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
| 20 | index 15f3687..7e9f173 100644 |
| 21 | --- a/Makefile.pre.in |
| 22 | +++ b/Makefile.pre.in |
| 23 | @@ -1456,7 +1456,7 @@ LIBPL= @LIBPL@ |
| 24 | LIBPC= $(LIBDIR)/pkgconfig |
| 25 | |
| 26 | libainstall: @DEF_MAKE_RULE@ python-config |
| 27 | - @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \ |
| 28 | + @for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \ |
| 29 | do \ |
| 30 | if test ! -d $(DESTDIR)$$i; then \ |
| 31 | echo "Creating directory $$i"; \ |
| 32 | -- |
| 33 | 2.7.4 |
| 34 | |