| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 1 | We're seeing pipesize.h being created in parallel: |
| 2 | |
| 3 | /bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h |
| 4 | /bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h |
| 5 | |
| 6 | ./mkbuiltins -D ../../bash-5.1/builtins ../../bash-5.1/builtins/ulimit.def |
| 7 | x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -c -DHAVE_CONFIG_H -DSHELL -I. -I.. -I../../bash-5.1 -I../../bash-5.1/include -I../../bash-5.1/lib -I../../bash-5.1/builtins -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= ulimit.c || ( rm -f ulimit.c ; exit 1 ) |
| 8 | make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' |
| 9 | rm -f redir.o |
| 10 | x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -DPROGRAM='"bash"' -DCONF_HOSTTYPE='"x86_64"' -DCONF_OSTYPE='"linux-gnu"' -DCONF_MACHTYPE='"x86_64-pokysdk-linux-gnu"' -DCONF_VENDOR='"pokysdk"' -DLOCALEDIR='"/opt/poky/3.2+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/locale"' -DPACKAGE='"bash"' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-5.1 -I../bash-5.1/include -I../bash-5.1/lib -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= -c ../bash-5.1/redir.c |
| 11 | In file included from ../../bash-5.1/builtins/../../bash-5.1/builtins/ulimit.def:95: |
| 12 | pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token |
| 13 | 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy |
| 14 | | ^ |
| 15 | make[1]: *** [Makefile:119: ulimit.o] Error 1 |
| 16 | make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' |
| 17 | make: *** [Makefile:737: builtins/libbuiltins.a] Error 1 |
| 18 | make: *** Waiting for unfinished jobs.... |
| 19 | In file included from ../bash-5.1/redir.c:61: |
| 20 | ./builtins/pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token |
| 21 | 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy |
| 22 | | ^ |
| 23 | make: *** [Makefile:101: redir.o] Error 1 |
| 24 | WARNING: exit code 1 from a shell command. |
| 25 | |
| 26 | which happens since builtins/ulimit.o depends on pipesize.h as well as a top |
| 27 | level dependency. This means: |
| 28 | |
| 29 | @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 |
| 30 | |
| 31 | races with: |
| 32 | |
| 33 | @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} targets ) || exit 1 |
| 34 | |
| 35 | Hack around this by forcing BUILTINS_LIBRARY onto pipesize.h as a dependency. |
| 36 | |
| 37 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-bash/2021-01/msg00152.html] |
| 38 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 39 | |
| 40 | Index: bash-5.1/Makefile.in |
| 41 | =================================================================== |
| 42 | --- bash-5.1.orig/Makefile.in |
| 43 | +++ bash-5.1/Makefile.in |
| 44 | @@ -746,7 +746,7 @@ ${DEFDIR}/bashgetopt.o: $(BUILTIN_SRCDIR |
| 45 | ${DEFDIR}/builtext.h: $(BUILTIN_DEFS) |
| 46 | @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) builtext.h ) || exit 1 |
| 47 | |
| 48 | -${DEFDIR}/pipesize.h: |
| 49 | +${DEFDIR}/pipesize.h: $(BUILTINS_LIBRARY) |
| 50 | @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 |
| 51 | |
| 52 | $(SDIR)/man2html$(EXEEXT): ${SUPPORT_SRC}/man2html.c |