Skip to content
Snippets Groups Projects
Commit 607b0d29 authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

add a patch for ltmain.sh reflecting modifications in CDI-PIO repo

parent 63b0df8b
No related branches found
No related tags found
3 merge requests!11Consolidation with CDI-PIO (1.8.x),!9test for buildbot-CI integration in gitlab,!8Consolidation with CDI-PIO (1.8.x)
......@@ -22,6 +22,7 @@ for patch in \
contrib/00nagfor-libtool-patch/nagfor-libtool-2.4.6.patch \
contrib/05macos-nagfor-patch/macos-nagfor.patch \
contrib/06ltmain_nag_pthread-patch/ltmain_nag_pthread.patch \
contrib/08ltmain-parallel-printf-patch/ltmain-parallel-printf.patch \
; do
echo "applying $patch"
patch -p 1 --no-backup-if-mismatch --forward -r - -i $patch -d .
......
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -310,6 +310,18 @@ test -z "$GREP" && {
# in the command search PATH.
: ${CP="cp -f"}
+# work around bug in libtool which raises an error when running in a
+# parallel make that should have been handled in printf internally
+printf()
+{
+ while ! builtin printf "$@" ; do
+ errcode=$?
+ # errcode might be EAGAIN=11 which means to simply try again
+ if [ $errcode != 11 ]; then
+ return $errcode
+ fi
+ done
+}
: ${ECHO="printf %s\n"}
: ${EGREP="$GREP -E"}
: ${FGREP="$GREP -F"}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment