diff options
| author | Zach van Rijn <me@zv.io> | 2024-07-27 10:43:25 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-08-07 10:30:47 -0500 |
| commit | a1c681d10a277ada668450db1c8b707511aeb7fa (patch) | |
| tree | d64b8c18f1c38ab13b0bf3722400925e72d21b5f | |
| parent | c35cb9bf44e5b2fbfbe809c6c505a00488ff0f3f (diff) | |
| download | packages-a1c681d10a277ada668450db1c8b707511aeb7fa.tar.gz packages-a1c681d10a277ada668450db1c8b707511aeb7fa.tar.bz2 packages-a1c681d10a277ada668450db1c8b707511aeb7fa.tar.xz packages-a1c681d10a277ada668450db1c8b707511aeb7fa.zip | |
user/qt-creator: Pass path for LLVM configuration
This ensures Qt Creator picks up the LLVM version we have selected for
it, instead of looking for a non-version-suffixed `llvm-config`.
Closes: #1231
| -rw-r--r-- | user/qt-creator/APKBUILD | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 6039cf923..57829bbe6 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -2,7 +2,8 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator pkgver=4.15.2 -pkgrel=1 +_llvmver=14 +pkgrel=2 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" arch="all" @@ -10,7 +11,7 @@ options="!check" # No test suite. license="LGPL-2.0 WITH Qt-LGPL-exception-1.1" depends="qt5-qtquickcontrols" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtserialport-dev - qt5-qtscript-dev qt5-qttools-dev clang-dev llvm14-dev python3 + qt5-qtscript-dev qt5-qttools-dev clang-dev llvm${_llvmver}-dev python3 libexecinfo-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/$pkgname-opensource-src-$pkgver.tar.xz @@ -22,6 +23,7 @@ ldpath="/usr/lib/qtcreator" builddir="$srcdir/$pkgname-opensource-src-$pkgver" build() { + export LLVM_CONFIG="$(command -v llvm${_llvmver}-config)" export LLVM_INSTALL_DIR=/usr qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo" make |