From a1c681d10a277ada668450db1c8b707511aeb7fa Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Sat, 27 Jul 2024 10:43:25 -0500
Subject: 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
---
user/qt-creator/APKBUILD | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'user')
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
--
cgit v1.2.3-70-g09d2