[SCM] qtcreator packaging branch, master, updated. debian/3.5.0+dfsg-1-8-ged535c3

[Adam Majer]

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

The following commit has been merged in the master branch:
commit a0b4cfbce257ad8061ca62c549d4a854333a9c3f
Author: Adam Majer <adamm at zombino.com>
Date:   Sun Sep 27 15:51:37 2015 -0500

    Disable rpaths in the clang code model plugin
---
 debian/changelog                       |  1 +
 debian/patches/disable_llvm_rpath.diff | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  1 +
 4 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 651fbab..914bc21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtcreator (3.5.0+dfsg-2) UNRELEASED; urgency=medium
   [ Adam Majer ]
   * Remove QtQuick1 build dependencies.
   * Enable ClangCodeModel plugin (closes: #791348)
+     + Disable rpath via debian/patches/disable_llvm_rpath.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Aug 2015 22:26:25 -0500
 
diff --git a/debian/patches/disable_llvm_rpath.diff b/debian/patches/disable_llvm_rpath.diff
new file mode 100644
index 0000000..525ff07
--- /dev/null
+++ b/debian/patches/disable_llvm_rpath.diff
@@ -0,0 +1,28 @@
+Index: qtcreator/src/plugins/clangcodemodel/clangcodemodel.pro
+===================================================================
+--- qtcreator.orig/src/plugins/clangcodemodel/clangcodemodel.pro	2015-09-27 14:54:16.570761417 -0500
++++ qtcreator/src/plugins/clangcodemodel/clangcodemodel.pro	2015-09-27 14:55:51.205735495 -0500
+@@ -9,7 +9,9 @@
+ DEFINES += CLANG_VERSION=\\"$${LLVM_VERSION}\\"
+ DEFINES += "\"CLANG_RESOURCE_DIR=\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\"\""
+ 
+-unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
++!llvm_disable_rpath {
++    unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
++}
+ 
+ SOURCES += \
+     activationsequencecontextprocessor.cpp \
+Index: qtcreator/src/tools/clangbackend/clangbackend.pro
+===================================================================
+--- qtcreator.orig/src/tools/clangbackend/clangbackend.pro	2015-08-18 05:02:51.000000000 -0500
++++ qtcreator/src/tools/clangbackend/clangbackend.pro	2015-09-27 14:57:41.536547126 -0500
+@@ -16,5 +16,7 @@
+ 
+ unix {
+     !osx: QMAKE_LFLAGS += -Wl,-z,origin
+-    QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
++    !llvm_disable_rpath {
++        QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 15612f1..8499022 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+disable_llvm_rpath.diff
 02_use_x-terminal-emulator.diff
 rpath_nonlinux.diff
 
diff --git a/debian/rules b/debian/rules
index 21fa344..580c668 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ override_dh_auto_configure:
 		QBS_INSTALL_DIR=/usr \
 		PREFIX=/usr/ \
 		LLVM_INSTALL_DIR="$(LLVM_INSTALL_DIR)" \
+		CONFIG+=llvm_disable_rpath \
 		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armhf))

-- 
qtcreator packaging