From 21ba050ffde83621f3bc6a4b5e096b8a07d25d05 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 16 Nov 2024 09:27:34 -0500 Subject: [PATCH] llvm18: rebuild for python3-3.13 --- srcpkgs/llvm18/template | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/srcpkgs/llvm18/template b/srcpkgs/llvm18/template index fd8b92e8d05..ff68e2693b0 100644 --- a/srcpkgs/llvm18/template +++ b/srcpkgs/llvm18/template @@ -1,14 +1,12 @@ # Template file for 'llvm18' pkgname=llvm18 version=18.1.8 -revision=2 +revision=3 build_wrksrc=llvm build_style=cmake -_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" configure_args=" -DCMAKE_BUILD_TYPE=Release -Wno-dev -DENABLE_LINKER_BUILD_ID=YES - -DLLDB_USE_SYSTEM_SIX=YES -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES -DLIBCXXABI_USE_LLVM_UNWINDER=YES @@ -29,14 +27,13 @@ configure_args=" -DLLVM_ENABLE_FFI=YES -DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO - -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages - -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver} - -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix " -hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx - python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config - python3-mdit-py-plugins python3-MyST-Parser python3-markdown-it $(vopt_if graphviz graphviz)" -makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel - libxml2-devel binutils-devel z3-devel" + -DLLDB_ENABLE_PYTHON=NO" +hostmakedepends="perl python3 zlib-devel libffi-devel swig git pkg-config + python3-Sphinx python3-recommonmark python3-sphinx-automodapi python3-yaml + python3-sphinx-markdown-tables python3-mdit-py-plugins python3-MyST-Parser + python3-markdown-it $(vopt_if graphviz graphviz)" +makedepends="zlib-devel elfutils-devel libffi-devel libedit-devel libxml2-devel + binutils-devel z3-devel" short_desc="LLVM Compiler Infrastructure Project - Version 18" maintainer="Daniel Martinez " license="Apache-2.0" @@ -224,6 +221,8 @@ pre_configure() { arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits configure_args+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF" + configure_args+=" -DCOMPILER_RT_BUILD_XRAY=OFF" + configure_args+=" -DCOMPILER_RT_BUILD_MEMPROF=OFF" ;; esac @@ -266,7 +265,6 @@ post_build() { } post_install() { - # Required for multilib. if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then for _header in llvm-config; do @@ -489,7 +487,6 @@ llvm-bolt18_package() { lldb18_package() { lib32disabled=yes - depends+=" python3-six" conflicts="lldb17>=0 lldb15>=0" short_desc+=" - LLDB debugger" homepage="https://lldb.llvm.org/" @@ -499,7 +496,6 @@ lldb18_package() { vmove usr/bin/lldb-instr vmove usr/bin/lldb-server vmove usr/bin/lldb-dap - vmove "usr/lib/python${py3_ver}/site-packages/lldb" if [ -z "$CROSS_BUILD" ]; then vmove /usr/lib/lua/5.3/lldb.so fi