#3 Build with LLVM/Clang 6.0 instead of latest available (#1655852) - for master branch
Merged 5 years ago by smani. Opened 5 years ago by ivanmironov.
https://github.com/im-0/fedora-rpm.qt-creator/ master-fix-code-model  into  master

Build with LLVM/Clang 6.0 instead of latest available (#1655852)
Ivan Mironov • 5 years ago  
qt-creator.spec
file modified
+10 -5
@@ -6,7 +6,7 @@

  

  Name:           qt-creator

  Version:        4.8.0

- Release:        0.3%{?prerelease:.%prerelease}%{?dist}

+ Release:        0.4%{?prerelease:.%prerelease}%{?dist}

  Summary:        Cross-platform IDE for Qt

  

  License:        GPLv3 with exceptions
@@ -42,8 +42,8 @@

  BuildRequires:  botan-devel

  BuildRequires:  diffutils

  BuildRequires:  libappstream-glib

- BuildRequires:  llvm-devel

- BuildRequires:  clang-devel

+ BuildRequires:  llvm6.0-devel

+ BuildRequires:  clang6.0-devel

  

  Requires:       hicolor-icon-theme

  Requires:       xdg-utils
@@ -103,9 +103,11 @@

  

  %build

  export QTDIR="%{_qt5_prefix}"

- export PATH="%{_qt5_bindir}:$PATH"

+ export PATH="%{_qt5_bindir}:%{_libdir}/llvm6.0/bin:$PATH"

+ # Include path reported by llvm-config (%{_libdir}/llvm6.0/include) does not contain clang include files.

+ export CXXFLAGS="-I%{_includedir}/llvm6.0"

  

- %qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 LLVM_INSTALL_DIR=%{_prefix} QMAKE_CFLAGS_ISYSTEM=-I QBS_INSTALL_DIR=%{_prefix} CONFIG+=disable_external_rpath

+ %qmake_qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1 QMAKE_CFLAGS_ISYSTEM=-I QBS_INSTALL_DIR=%{_prefix} CONFIG+=disable_external_rpath

  %make_build

  %make_build qch_docs

  
@@ -181,6 +183,9 @@

  

  

  %changelog

+ * Tue Dec 04 2018 Ivan Mironov <mironov.ivan@gmail.com> - 4.8.0-0.4.rc1

+ - Build with LLVM/Clang 6.0 instead of latest available (#1655852)

+ 

  * Sat Nov 24 2018 Sandro Mani <manisandro@gmail.com> - 4.8.0-0.3.rc1

  - Update to 4.8.0-rc1

  

no initial comment

Pull-Request has been merged by smani

5 years ago
Metadata