[jhbuild] Fix installation of libclang dependency (at least on Fedora)



commit d7c30a8111c872fa3b75934015cc208aa8494f86
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Thu Apr 27 19:58:15 2017 -0500

    Fix installation of libclang dependency (at least on Fedora)
    
    Also, rename to libclang, since that's what we need. Don't care if it
    installs the compiler itself or not.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781872

 modulesets/gnome-apps-3.26.modules    |    2 +-
 modulesets/gnome-sysdeps-3.26.modules |   52 ++++++++++++++++----------------
 2 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.26.modules b/modulesets/gnome-apps-3.26.modules
index 3d312c0..1d622ce 100644
--- a/modulesets/gnome-apps-3.26.modules
+++ b/modulesets/gnome-apps-3.26.modules
@@ -306,7 +306,6 @@
   <autotools id="gnome-builder">
     <branch/>
     <dependencies>
-      <dep package="clang"/>
       <dep package="devhelp"/>
       <dep package="gjs"/>
       <dep package="glib"/>
@@ -314,6 +313,7 @@
       <dep package="gspell"/>
       <dep package="gtk+-3"/>
       <dep package="gtksourceview-3"/>
+      <dep package="libclang"/>
       <dep package="libgit2-glib"/>
       <dep package="libpeas"/>
       <dep package="librsvg"/>
diff --git a/modulesets/gnome-sysdeps-3.26.modules b/modulesets/gnome-sysdeps-3.26.modules
index 8b8cb13..734ee12 100644
--- a/modulesets/gnome-sysdeps-3.26.modules
+++ b/modulesets/gnome-sysdeps-3.26.modules
@@ -85,32 +85,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="clang">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="llvm-config">
-        <!-- Debian -->
-        <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"/>
-        <!-- FreeBSD -->
-        <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"/>
-      </dep>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="cups">
     <branch repo="system" version="1.4"/>
     <systemdependencies>
@@ -448,6 +422,32 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="libclang">
+    <branch repo="system"/>
+    <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-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"/>
+        <!-- FreeBSD -->
+        <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"/>
+      </dep>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="libdmapsharing">
     <pkg-config>libdmapsharing-3.0.pc</pkg-config>
     <branch repo="system"/>


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