[jhbuild] sysdeps-3.18/3.20: Add alternative c_include for llvm and clang

[Ting-Wei Lan <lantw src gnome org>]

commit 1bd67fc2499c14ed32c6a52a43d87c170092b51d
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Mon Sep 21 03:07:38 2015 +0800

    sysdeps-3.18/3.20: Add alternative c_include for llvm and clang
    
    https://bugzilla.gnome.org/show_bug.cgi?id=754041

 modulesets/gnome-sysdeps-3.18.modules |   36 +++++++++++++++++++++++++++++++-
 modulesets/gnome-sysdeps-3.20.modules |   36 +++++++++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 4 deletions(-)
---
diff --git a/modulesets/gnome-sysdeps-3.18.modules b/modulesets/gnome-sysdeps-3.18.modules
index cd5784a..9824ce0 100644
--- a/modulesets/gnome-sysdeps-3.18.modules
+++ b/modulesets/gnome-sysdeps-3.18.modules
@@ -65,7 +65,23 @@
   <systemmodule id="clang">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="path" name="llvm-config"/>
+      <dep type="path" name="llvm-config">
+        <!-- Debian -->
+        <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"/>
+        <!-- FreeBSD -->
+        <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"/>
+      </dep>
     </systemdependencies>
   </systemmodule>
 
@@ -761,7 +777,23 @@
   <systemmodule id="llvm">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="c_include" name="llvm-c/Core.h"/>
+      <dep type="c_include" name="llvm-c/Core.h">
+        <!-- Debian -->
+        <altdep type="c_include" name="llvm-c-3.9/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.8/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.7/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.6/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.5/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.4/llvm-c/Core.h"/>
+        <!-- FreeBSD -->
+        <altdep type="c_include" name="../llvm39/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm38/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm37/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm36/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm35/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm34/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm-devel/include/llvm-c/Core.h"/>
+      </dep>
     </systemdependencies>
   </systemmodule>
 
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index 83a3cc9..6985f35 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -70,7 +70,23 @@
   <systemmodule id="clang">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="path" name="llvm-config"/>
+      <dep type="path" name="llvm-config">
+        <!-- Debian -->
+        <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"/>
+        <!-- FreeBSD -->
+        <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"/>
+      </dep>
     </systemdependencies>
   </systemmodule>
 
@@ -769,7 +785,23 @@
   <systemmodule id="llvm">
     <branch repo="system"/>
     <systemdependencies>
-      <dep type="c_include" name="llvm-c/Core.h"/>
+      <dep type="c_include" name="llvm-c/Core.h">
+        <!-- Debian -->
+        <altdep type="c_include" name="llvm-c-3.9/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.8/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.7/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.6/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.5/llvm-c/Core.h"/>
+        <altdep type="c_include" name="llvm-c-3.4/llvm-c/Core.h"/>
+        <!-- FreeBSD -->
+        <altdep type="c_include" name="../llvm39/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm38/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm37/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm36/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm35/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm34/include/llvm-c/Core.h"/>
+        <altdep type="c_include" name="../llvm-devel/include/llvm-c/Core.h"/>
+      </dep>
     </systemdependencies>
   </systemmodule>