[SCM] qtcreator packaging branch, master, updated. debian/4.3.1-1-11-g9306b36

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=9306b36

The following commit has been merged in the master branch:
commit 9306b3634936e138f4ef82d703396d2032e2d39e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 24 23:21:34 2017 -0300

    Export LLVM_INSTALL_DIR without harcoding the version.
---
 debian/changelog | 1 +
 debian/rules     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c10be81..2fede40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtcreator (4.4.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Switch to unversioned llvm-dev and libclang-dev, see if we can keep this
     dependencies this way (Closes: #873414).
+    - Export LLVM_INSTALL_DIR without harcoding the version.
   * Switch to compat 10 which uses parallel building by default.
     - Depend on debhelper >= 10.
 
diff --git a/debian/rules b/debian/rules
index 70349c8..ef05b9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,12 @@ export QMAKE_CXXFLAGS_DEBUG := $(CXXFLAGS)
 export QMAKE_LFLAGS_RELEASE := $(LDFLAGS)
 export QMAKE_LFLAGS_DEBUG := $(LDFLAGS)
 export QT_SELECT := qt5
-export LLVM_INSTALL_DIR := $(shell if [ -d /usr/lib/llvm-3.9 ]; then echo /usr/lib/llvm-3.9; fi)
+
+LLVM_PREFIX := $(shell grep LLVM_PREFIX /usr/include/llvm/Config/llvm-config.h | sed 's/.*\(\/usr\/lib\/llvm-[0-9].[0-9]\).*/
/g')
+
+ifneq ($(LLVM_PREFIX),)
+    export LLVM_INSTALL_DIR := $(LLVM_PREFIX)
+endif
 
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)

-- 
qtcreator packaging