[jhbuild] sysdeps-latest: Use headers to find libclang



commit 46fdef82b20343113d76cb79387608274ba0a5fa
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Sep 17 17:01:56 2019 +0800

    sysdeps-latest: Use headers to find libclang
    
    It is broken to find libclang with llvm-config. Packages providing
    llvm-config commands are not guaranteed to include libclang as well.
    
    This commit does not fix the bug mentioned below. Relative paths
    including '..' will not work with package managers such as apt-file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781872

 modulesets/gnome-sysdeps-latest.modules | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index 5c779faf..25345265 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -522,31 +522,31 @@
     <systemdependencies>
       <dep type="c_include" name="clang-c/Index.h">
         <!-- Debian. FIXME: This is definitely broken. https://bugzilla.gnome.org/show_bug.cgi?id=781872 -->
-        <altdep type="path" name="llvm-config-9"/>
-        <altdep type="path" name="llvm-config-8"/>
-        <altdep type="path" name="llvm-config-7"/>
-        <altdep type="path" name="llvm-config-6.0"/>
-        <altdep type="path" name="llvm-config-5.0"/>
-        <altdep type="path" name="llvm-config-4.0"/>
-        <altdep type="path" name="llvm-config-3.9"/>
-        <altdep type="path" name="llvm-config-3.8"/>
-        <altdep type="path" name="llvm-config-3.7"/>
-        <altdep type="path" name="llvm-config-3.6"/>
-        <altdep type="path" name="llvm-config-3.5"/>
-        <altdep type="path" name="llvm-config-3.4"/>
+        <altdep type="c_include" name="../lib/llvm-9/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-8/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-7/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-6.0/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-5.0/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-4.0/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-3.9/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-3.8/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-3.7/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-3.6/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-3.5/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../lib/llvm-3.4/include/clang-c/Index.h"/>
         <!-- FreeBSD -->
-        <altdep type="path" name="llvm-config80"/>
-        <altdep type="path" name="llvm-config70"/>
-        <altdep type="path" name="llvm-config60"/>
-        <altdep type="path" name="llvm-config50"/>
-        <altdep type="path" name="llvm-config40"/>
-        <altdep type="path" name="llvm-config39"/>
-        <altdep type="path" name="llvm-config38"/>
-        <altdep type="path" name="llvm-config37"/>
-        <altdep type="path" name="llvm-config36"/>
-        <altdep type="path" name="llvm-config35"/>
-        <altdep type="path" name="llvm-config34"/>
-        <altdep type="path" name="llvm-config-devel"/>
+        <altdep type="c_include" name="../llvm80/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm70/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm60/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm50/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm40/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm39/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm38/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm37/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm36/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm35/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm34/include/clang-c/Index.h"/>
+        <altdep type="c_include" name="../llvm-devel/include/clang-c/Index.h"/>
       </dep>
     </systemdependencies>
   </systemmodule>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]