From 445c96e4ebcf7ed89e45d74c640d5816eeead5de Mon Sep 17 00:00:00 2001 From: Moritz Haase Date: Mon, 10 Mar 2025 11:23:13 +0100 Subject: [PATCH] main/llvm20: Build with curl to fix debuginfod client support For debuginfod client functionality in LLVM tooling (like llvm-symbolizer or llvm-debuginfod-find) to actually work, LLVM needs to be build with curl (see [0] and #16972). Otherwise, HTTP requests get turned into no-ops, resulting in debuginfod functionality to fail (without any useful error messages). The configuration option is the same across all currently available LLVM versions and we will enable it one by one to not have one single MR with very long build times. It has been verified that cross-compiliation (via 'bootstrap.sh') still works. [0]: https://reviews.llvm.org/D111238 --- main/llvm20/APKBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/llvm20/APKBUILD b/main/llvm20/APKBUILD index bf0bfc3f0b6..1517dea7fe6 100644 --- a/main/llvm20/APKBUILD +++ b/main/llvm20/APKBUILD @@ -11,7 +11,7 @@ pkgver=20.1.0 _majorver=${pkgver%%.*} _prevmajorver=$((_majorver - 1)) pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" arch="all" url="https://llvm.org/" @@ -19,8 +19,8 @@ license="Apache-2.0" depends_dev="$pkgname=$pkgver-r$pkgrel libffi-dev zlib-dev zstd-dev" # See https://gitlab.alpinelinux.org/alpine/aports/-/commit/51d2fba931fb2ef0046dea19405a9290c8735051#note_234651 [ -z "$BOOTSTRAP" ] && depends_dev="$depends_dev $pkgname-test-utils=$pkgver-r$pkgrel" -makedepends_host="$depends_dev binutils-dev libxml2-dev" -makedepends_build="cmake chrpath python3 py3-setuptools samurai" +makedepends_host="$depends_dev binutils-dev curl-dev libxml2-dev" +makedepends_build="chrpath cmake python3 py3-setuptools samurai" # diffutils for diff: unrecognized option: strip-trailing-cr # coreutils for 'od' binary checkdepends="bash coreutils diffutils" @@ -155,6 +155,7 @@ build() { -DLLVM_BUILD_LLVM_DYLIB=ON \ -DLLVM_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \ -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DLLVM_ENABLE_CURL=FORCE_ON \ -DLLVM_ENABLE_DUMP=ON \ -DLLVM_ENABLE_EH=ON \ -DLLVM_ENABLE_FFI=ON \