From e6bf20adad1314d34d27a60be0db71c3d5a6f66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Tue, 7 Jul 2020 12:08:19 +0300
Subject: [PATCH] =?UTF-8?q?dev-qt/qt-creator:=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BF=D0=B0=D1=82=D1=87=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=204.8=20?=
 =?UTF-8?q?=D1=81=20clang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev-qt/qt-creator/.calculate_directory    |  1 +
 .../qt-creator-4.8-clang_build.patch          | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/.calculate_directory
 create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/qt-creator-4.8-clang_build.patch

diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/.calculate_directory
new file mode 100644
index 000000000..5c965ea54
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/.calculate_directory
@@ -0,0 +1 @@
+# Calculate merge()!= append=skip
diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/qt-creator-4.8-clang_build.patch b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/qt-creator-4.8-clang_build.patch
new file mode 100644
index 000000000..93f3b3e9a
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_install_patch/dev-qt/qt-creator/qt-creator-4.8-clang_build.patch
@@ -0,0 +1,40 @@
+# Calculate format=diff merge(dev-qt/qt-creator)=>4.8,4.9
+--- a/src/shared/clang/clang_installation.pri
++++ b/src/shared/clang/clang_installation.pri
+@@ -150,16 +150,6 @@
+ output = $$system($$llvm_config --version, lines)
+ LLVM_VERSION = $$extractVersion($$output)
+ 
+-!isEmpty(LLVM_VERSION) {
+-    versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
+-        CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+-        win32:CLANGFORMAT_LIBS += -lversion
+-    } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): {
+-        CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+-        win32:CLANGFORMAT_LIBS += -lversion
+-    }
+-}
+-
+ isEmpty(LLVM_VERSION) {
+     $$llvmWarningOrError(\
+         "Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\
+@@ -210,6 +200,19 @@
+         $$llvmWarningOrError("Cannot find Clang shared library in $$LLVM_LIBDIR")
+     }
+ 
++    versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
++        exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
++            CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++            win32:CLANGFORMAT_LIBS += -lversion
++        } else {
++            CLANGFORMAT_LIBS=-lclang-cpp
++            ALL_CLANG_LIBS=-lclang-cpp
++        }
++    } else:versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): {
++        CLANGFORMAT_LIBS=-lclangFormat -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++        win32:CLANGFORMAT_LIBS += -lversion
++    }
++
+     !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBCLANG_LIBS = -L$${LLVM_LIBDIR}
+     LIBCLANG_LIBS += $${CLANG_LIB}
+