[FFmpeg-cvslog] configure: handle xargs versions that exec empty commands

Timo Rothenpieler git at videolan.org
Wed May 1 20:47:18 EEST 2024


ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Wed May  1 19:40:00 2024 +0200| [476688095f5f5ecb4e3b1d77f96eecf7de7e3c3c] | committer: Timo Rothenpieler

configure: handle xargs versions that exec empty commands

Some versions of xargs don't run any commands if no input is given,
others do run it at least once, causing errors.
Pass -r to xargs to avoid that behaviour and never run empty commands.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=476688095f5f5ecb4e3b1d77f96eecf7de7e3c3c
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 89af5f75e7..6f3746ce35 100755
--- a/configure
+++ b/configure
@@ -5037,7 +5037,7 @@ probe_cc(){
             _ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r')
         fi
         if [ -x "$(command -v wslpath)" ]; then
-            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); if (!match($$0, / /)) { print $$0 } }'\'' | xargs -d\\n -n1 wslpath -u | awk '\''BEGIN { printf "%s:", "$@" }; { sub(/\r/,""); printf " %s", $$0 }; END { print "" }'\'' > $(@:.o=.d)'
+            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); if (!match($$0, / /)) { print $$0 } }'\'' | xargs -r -d\\n -n1 wslpath -u | awk '\''BEGIN { printf "%s:", "$@" }; { sub(/\r/,""); printf " %s", $$0 }; END { print "" }'\'' > $(@:.o=.d)'
 
         else
             _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'



More information about the ffmpeg-cvslog mailing list