diff --git a/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20250702.ebuild b/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20250702.ebuild index 990bb434e8..ee8706198f 100644 --- a/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20250702.ebuild +++ b/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20250702.ebuild @@ -23,13 +23,16 @@ else fi ALL_LLVM_TARGETS="AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai LoongArch M68k MSP430 Mips NVPTX PowerPC RISCV SPIRV Sparc SystemZ VE WebAssembly +X86 XCore Xtensa" -IUSE="+debug +default-reflection-latest +pie" +IUSE="+debug +default-reflection-latest +pie +static-libs" for target in ${ALL_LLVM_TARGETS}; do IUSE+=" ${target%${target#+}}llvm_targets_${target#+}" done -# TODO -RDEPEND="virtual/zlib:=" +RDEPEND=" + app-arch/zstd:= + dev-libs/libxml2:= + virtual/zlib:= +" DEPEND="${RDEPEND}" PATCHES=( @@ -80,6 +83,11 @@ src_configure() { -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_PROJECTS="clang" -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx" + -DRUNTIMES_CMAKE_ARGS="\ + -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${BUILD_DIR}/${libdir};\ + -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${BUILD_DIR}/${libdir};\ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF;\ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON" -DLLVM_TARGETS_TO_BUILD="$(IFS=';'; echo "${targets[*]}")" -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_TESTS=OFF @@ -92,12 +100,13 @@ src_configure() { -DLLVM_ENABLE_ZLIB=FORCE_ON -DLIBCXX_ENABLE_SHARED=ON - -DLIBCXX_ENABLE_STATIC=OFF + -DLIBCXX_ENABLE_STATIC=$(usex static-libs) -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_USE_COMPILER_RT=OFF -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_BENCHMARKS=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include -DLIBCXXABI_USE_LLVM_UNWINDER=OFF diff --git a/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20260204.ebuild b/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20260204.ebuild index 9ad4e9fbe8..8002b16aef 100644 --- a/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20260204.ebuild +++ b/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-21.0.0_p20260204.ebuild @@ -23,13 +23,16 @@ else fi ALL_LLVM_TARGETS="AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai LoongArch M68k MSP430 Mips NVPTX PowerPC RISCV SPIRV Sparc SystemZ VE WebAssembly +X86 XCore Xtensa" -IUSE="+debug +default-reflection-latest +pie" +IUSE="+debug +default-reflection-latest +pie +static-libs" for target in ${ALL_LLVM_TARGETS}; do IUSE+=" ${target%${target#+}}llvm_targets_${target#+}" done -# TODO -RDEPEND="virtual/zlib:=" +RDEPEND=" + app-arch/zstd:= + dev-libs/libxml2:= + virtual/zlib:= +" DEPEND="${RDEPEND}" PATCHES=( @@ -80,6 +83,11 @@ src_configure() { -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_PROJECTS="clang" -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx" + -DRUNTIMES_CMAKE_ARGS="\ + -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${BUILD_DIR}/${libdir};\ + -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${BUILD_DIR}/${libdir};\ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF;\ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON" -DLLVM_TARGETS_TO_BUILD="$(IFS=';'; echo "${targets[*]}")" -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_TESTS=OFF @@ -92,12 +100,13 @@ src_configure() { -DLLVM_ENABLE_ZLIB=FORCE_ON -DLIBCXX_ENABLE_SHARED=ON - -DLIBCXX_ENABLE_STATIC=OFF + -DLIBCXX_ENABLE_STATIC=$(usex static-libs) -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_USE_COMPILER_RT=OFF -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_BENCHMARKS=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include -DLIBCXXABI_USE_LLVM_UNWINDER=OFF diff --git a/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-9999.ebuild b/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-9999.ebuild index 932d2ff402..c6477c9e7c 100644 --- a/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-9999.ebuild +++ b/sys-devel/clang-bloomberg-p2996/clang-bloomberg-p2996-9999.ebuild @@ -23,13 +23,16 @@ else fi ALL_LLVM_TARGETS="AArch64 AMDGPU ARC ARM AVR BPF CSKY DirectX Hexagon Lanai LoongArch M68k MSP430 Mips NVPTX PowerPC RISCV SPIRV Sparc SystemZ VE WebAssembly +X86 XCore Xtensa" -IUSE="+debug +default-reflection-latest +pie" +IUSE="+debug +default-reflection-latest +pie +static-libs" for target in ${ALL_LLVM_TARGETS}; do IUSE+=" ${target%${target#+}}llvm_targets_${target#+}" done -# TODO -RDEPEND="virtual/zlib:=" +RDEPEND=" + app-arch/zstd:= + dev-libs/libxml2:= + virtual/zlib:= +" DEPEND="${RDEPEND}" PATCHES=( @@ -80,6 +83,11 @@ src_configure() { -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_ENABLE_PROJECTS="clang" -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx" + -DRUNTIMES_CMAKE_ARGS="\ + -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${BUILD_DIR}/${libdir};\ + -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${BUILD_DIR}/${libdir};\ + -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF;\ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON" -DLLVM_TARGETS_TO_BUILD="$(IFS=';'; echo "${targets[*]}")" -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_TESTS=OFF @@ -92,12 +100,13 @@ src_configure() { -DLLVM_ENABLE_ZLIB=FORCE_ON -DLIBCXX_ENABLE_SHARED=ON - -DLIBCXX_ENABLE_STATIC=OFF + -DLIBCXX_ENABLE_STATIC=$(usex static-libs) -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_USE_COMPILER_RT=OFF -DLIBCXX_HAS_GCC_S_LIB=OFF -DLIBCXX_INCLUDE_BENCHMARKS=OFF -DLIBCXX_INCLUDE_TESTS=OFF + -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include -DLIBCXXABI_USE_LLVM_UNWINDER=OFF