[vlc-commits] tools: allow fast dependency with gccwindows (LLVM mingw64) as well as gcc

Steve Lhomme git at videolan.org
Thu Jun 18 13:09:33 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Mar  1 16:27:01 2019 +0100| [e6666a6449a12ac532ecbadd1eb37bbbc6fd4392] | committer: Steve Lhomme

tools: allow fast dependency with gccwindows (LLVM mingw64) as well as gcc

(cherry picked from commit c3a40bafe4732ffce80b072f8a5d7310858922e6)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e6666a6449a12ac532ecbadd1eb37bbbc6fd4392
---

 extras/tools/automake-clang.patch | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/extras/tools/automake-clang.patch b/extras/tools/automake-clang.patch
index 63fb668f91..d44b83f738 100644
--- a/extras/tools/automake-clang.patch
+++ b/extras/tools/automake-clang.patch
@@ -1,5 +1,5 @@
---- automake/lib/depcomp.clangmsvc	2014-12-31 14:26:32.000000000 +0100
-+++ automake/lib/depcomp	2019-03-01 11:33:02.672713200 +0100
+--- automake/lib/depcomp	2019-03-01 16:29:06.073143400 +0100
++++ automake/lib/depcomp.gccwindows	2019-03-01 16:29:30.646075800 +0100
 @@ -563,6 +563,36 @@ msvc7msys)
    exit 1
    ;;
@@ -37,3 +37,15 @@
  #nosideeffect)
    # This comment above is used by automake to tell side-effect
    # dependency tracking mechanisms from slower ones.
+--- automake/m4/depend.m4	2019-03-01 16:22:29.083243300 +0100
++++ automake/m4/depend.m4.gccwindows	2019-03-01 16:22:36.408049300 +0100
+@@ -152,7 +152,8 @@ fi
+ AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+ AM_CONDITIONAL([am__fastdep$1], [
+   test "x$enable_dependency_tracking" != xno \
+-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++  && ( test "$am_cv_$1_dependencies_compiler_type" = gcc3 ||
++       test "$am_cv_$1_dependencies_compiler_type" = gccwindows )])
+ ])
+ 
+ 



More information about the vlc-commits mailing list