r54476 - in /packages/unstable/gnome-builder/debian: changelog control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Oct 16 16:40:29 2017
New Revision: 54476

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54476
Log:
Re-enable clang support on armel, as LLVM is fixed there.

Modified:
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/control
    packages/unstable/gnome-builder/debian/control.in
    packages/unstable/gnome-builder/debian/rules

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=54476&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Mon Oct 16 16:40:29 2017
@@ -2,6 +2,7 @@
 
   * Build-depend on python3 and python3-gi rather than the development
     packages, as we don't need development headers.
+  * Re-enable clang support on armel, as LLVM is fixed there.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 15 Oct 2017 16:09:16 +0200
 

Modified: packages/unstable/gnome-builder/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/control?rev=54476&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/control	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/control	[utf-8] Mon Oct 16 16:40:29 2017
@@ -17,7 +17,7 @@
                exuberant-ctags,
                gnome-pkg-tools,
                gobject-introspection (>= 1.48.0),
-               libclang-dev [!armel],
+               libclang-dev,
                libdazzle-1.0-dev (>= 3.26.1),
                libdevhelp-dev (>= 3.20.0),
                libenchant-dev (>= 1.6.0),
@@ -38,7 +38,7 @@
                libvte-2.91-dev (>= 0.46),
                libwebkit2gtk-4.0-dev (>= 2.8.4),
                libxml2-dev (>= 2.9.0),
-               llvm [!armel],
+               llvm,
                meson (>= 0.40.1),
                mm-common,
                sysprof (>= 3.23.91) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el alpha powerpcspe x32],
@@ -64,7 +64,7 @@
          python3-gi,
          valac-0.36-vapi,
          libvala-0.36-dev,
-         clang [!armel],
+         clang,
          ${gir:Depends},
          ${misc:Depends},
          ${python3:Depends},

Modified: packages/unstable/gnome-builder/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/control.in?rev=54476&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/control.in	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/control.in	[utf-8] Mon Oct 16 16:40:29 2017
@@ -13,7 +13,7 @@
                exuberant-ctags,
                gnome-pkg-tools,
                gobject-introspection (>= 1.48.0),
-               libclang-dev [!armel],
+               libclang-dev,
                libdazzle-1.0-dev (>= 3.26.1),
                libdevhelp-dev (>= 3.20.0),
                libenchant-dev (>= 1.6.0),
@@ -34,7 +34,7 @@
                libvte-2.91-dev (>= 0.46),
                libwebkit2gtk-4.0-dev (>= 2.8.4),
                libxml2-dev (>= 2.9.0),
-               llvm [!armel],
+               llvm,
                meson (>= 0.40.1),
                mm-common,
                sysprof (>= 3.23.91) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el alpha powerpcspe x32],
@@ -60,7 +60,7 @@
          python3-gi,
          valac-0.36-vapi,
          libvala-0.36-dev,
-         clang [!armel],
+         clang,
          ${gir:Depends},
          ${misc:Depends},
          ${python3:Depends},

Modified: packages/unstable/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/rules?rev=54476&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/rules	[utf-8] Mon Oct 16 16:40:29 2017
@@ -35,12 +35,6 @@
 VALGRIND_PLUGIN = -Dwith_valgrind=false
 endif
 
-ifeq (armel,$(DEB_HOST_ARCH))
-CLANG_PLUGIN = -Dwith_clang=false
-else
-CLANG_PLUGIN = -Dwith_clang=true
-endif
-
 ifneq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
 FLATPAK_PLUGIN = -Dwith_flatpak=true
 else
@@ -56,6 +50,7 @@
 		-Dwith_autotools_templates=true \
 		-Dwith_beautifier=true \
 		-Dwith_cargo=true \
+		-Dwith_clang=true \
 		-Dwith_cmake=true \
 		-Dwith_color_picker=true \
 		-Dwith_command_bar=true \
@@ -92,7 +87,6 @@
 		-Dwith_todo=true \
 		-Dwith_vala-pack=true \
 		-Dwith_xml-pack=true \
-		$(CLANG_PLUGIN) \
 		$(FLATPAK_PLUGIN) \
 		$(SYSPROF_PLUGIN) \
 		$(VALGRIND_PLUGIN)