From 0bd88dfdb4a66870b6d14bfeed6797518a588003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 17 Jun 2025 07:34:30 +0700 Subject: [PATCH] llvm19: fix libz3 link --- srcpkgs/llvm19/patches/z3-libs.patch | 21 +++++++++++++++++++++ srcpkgs/llvm19/template | 4 +--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/llvm19/patches/z3-libs.patch diff --git a/srcpkgs/llvm19/patches/z3-libs.patch b/srcpkgs/llvm19/patches/z3-libs.patch new file mode 100644 index 00000000000..9e61804f4b7 --- /dev/null +++ b/srcpkgs/llvm19/patches/z3-libs.patch @@ -0,0 +1,21 @@ +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -583,6 +583,7 @@ if (LLVM_ENABLE_Z3_SOLVER) + if (NOT Z3_FOUND) + message(FATAL_ERROR "LLVM_ENABLE_Z3_SOLVER cannot be enabled when Z3 is not available.") + endif() ++ set(Z3_LIBRARIES z3) + + set(LLVM_WITH_Z3 1) + endif() +--- a/llvm/lib/Support/CMakeLists.txt ++++ b/llvm/lib/Support/CMakeLists.txt +@@ -86,7 +86,7 @@ endif() + + # Link Z3 if the user wants to build it. + if(LLVM_WITH_Z3) +- set(system_libs ${system_libs} ${Z3_LIBRARIES}) ++ set(system_libs ${system_libs} z3) + endif() + + # Override the C runtime allocator on Windows and embed it into LLVM tools & libraries diff --git a/srcpkgs/llvm19/template b/srcpkgs/llvm19/template index 0de2091ceab..e89a5566bab 100644 --- a/srcpkgs/llvm19/template +++ b/srcpkgs/llvm19/template @@ -1,7 +1,7 @@ # Template file for 'llvm19' pkgname=llvm19 version=19.1.4 -revision=6 +revision=7 build_wrksrc=llvm build_style=cmake _llvm_prefix=lib/llvm/19 @@ -369,8 +369,6 @@ post_install() { vmkdir usr/lib/clang ln -s ../llvm/19/lib/clang/19 ${DESTDIR}/usr/lib/clang/19 - - sed -i 's|/usr[^;]*libz3.so|z3|' "${DESTDIR}/${_llvm_libdir}/cmake/llvm/LLVMExports.cmake" } _llvm_alts=(