[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: configure.ac: Allow passing VLC_COMPILE_BY and VLC_COMPILE_HOST.

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC


Commits:
84cf9554 by Vagrant Cascadian at 2021-10-11T13:06:26+00:00
configure.ac: Allow passing VLC_COMPILE_BY and VLC_COMPILE_HOST.

This allows passing a specific value instead of inheriting these
values from the build environment.

Fixes #26035

(cherry picked from commit 9e7ed0247dd298fe8597431ae0738882e734011b) (edited)

edited:
- the 3.0 branch doesn't have [] around the variable names

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -
2c077f26 by Steve Lhomme at 2021-10-11T13:06:26+00:00
configure: fix VLC_COMPILE_BY/VLC_COMPILE_HOST empty by default

After 9e7ed0247dd298fe8597431ae0738882e734011b the test for the environment
variable wasn't done properly. Resulting in empty variables (and error messages
during configure).

Fixes #26165

(cherry picked from commit 0357c443e2f9e26f70bccc1cca9f8d376ffe9c1c) (rebased)

rebased:
- the 3.0 branch doesn't have [] around the variable names

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


1 changed file:

- configure.ac


Changes:

=====================================
configure.ac
=====================================
@@ -4324,8 +4324,14 @@ AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_REVISION)
 AC_SUBST(VERSION_EXTRA)
 AC_SUBST(COPYRIGHT_YEARS)
-AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami|sed -e 's/\\\/\\\\\\\/g'`", [user who ran configure])
-AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure])
+AS_IF([test -z "$VLC_COMPILE_BY"],[
+   VLC_COMPILE_BY=`whoami|sed -e 's/\\\/\\\\\\\/g'`
+])
+AC_DEFINE_UNQUOTED([VLC_COMPILE_BY], "$VLC_COMPILE_BY", [user who ran configure])
+AS_IF([test -z "$VLC_COMPILE_HOST"],[
+   VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
+])
+AC_DEFINE_UNQUOTED([VLC_COMPILE_HOST], "$VLC_COMPILE_HOST", [host which ran configure])
 AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", [compiler])
 dnl
 dnl  Handle substvars that use $(top_srcdir)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6e16880810fcdbfd5d2ab89226f0b76c4a4fbf22...2c077f260eaa8d17370d35ad47b8ba10bf987bae

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/6e16880810fcdbfd5d2ab89226f0b76c4a4fbf22...2c077f260eaa8d17370d35ad47b8ba10bf987bae
You're receiving this email because of your account on code.videolan.org.