summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2024-07-27 09:46:54 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-08-09 15:11:38 -0500
commit1bcc2f5f6fbfa0c027334a367e5b00f6030bc9ab (patch)
treeb7b7f2873360308c516c6a9270340c23f453a5d9 /user
parenta1c681d10a277ada668450db1c8b707511aeb7fa (diff)
downloadpackages-1bcc2f5f6fbfa0c027334a367e5b00f6030bc9ab.tar.gz
packages-1bcc2f5f6fbfa0c027334a367e5b00f6030bc9ab.tar.bz2
packages-1bcc2f5f6fbfa0c027334a367e5b00f6030bc9ab.tar.xz
packages-1bcc2f5f6fbfa0c027334a367e5b00f6030bc9ab.zip
user/{mozilla}: Use specified LLVM tool version
This ensures the Mozilla build system can find tools like llvm-objcopy without the desired LLVM version being the default one. Closes: #1230
Diffstat (limited to 'user')
-rw-r--r--user/firefox-esr/APKBUILD4
-rw-r--r--user/thunderbird/APKBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index c3a851fc2..82c29ffd7 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -2,6 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=firefox-esr
pkgver=91.13.0
+_llvmver=14
pkgrel=4
pkgdesc="Firefox web browser (extended support release)"
url="https://www.mozilla.org/firefox/"
@@ -14,7 +15,7 @@ depends=""
# system-libs
# actual deps
makedepends="
- autoconf2.13 cargo cbindgen clang llvm14-dev node ncurses-dev
+ autoconf2.13 cargo cbindgen clang llvm${_llvmver}-dev node ncurses-dev
perl python3 rust rust-std cmd:which
ncurses-dev openssl-dev
@@ -96,6 +97,7 @@ prepare() {
}
build() {
+ export PATH="/usr/lib/llvm${_llvmver}/bin:${PATH}" #1230
export SHELL=/bin/sh
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index f8ff05c52..9dc8d646b 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -2,6 +2,7 @@
pkgname=thunderbird
pkgver=91.13.0
pkgrel=3
+_llvmver=14
pkgdesc="Email client from Mozilla"
url="https://www.thunderbird.net/"
arch="all !ppc" # #837
@@ -12,7 +13,7 @@ depends=""
# system-libs
# actual deps
makedepends="
- autoconf2.13 cargo cbindgen clang llvm14-dev node ncurses-dev
+ autoconf2.13 cargo cbindgen clang llvm${_llvmver}-dev node ncurses-dev
perl python3 rust cmd:which
alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev
@@ -110,6 +111,7 @@ prepare() {
}
build() {
+ export PATH="/usr/lib/llvm${_llvmver}/bin:${PATH}" #1230
export SHELL=/bin/sh
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1