Rebuild package
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
name: llvm20
|
||||
description: A collection of modular and reusable compiler and toolchain technologies
|
||||
version: 20.1.8
|
||||
revision: 2
|
||||
revision: 3
|
||||
url: https://llvm.org
|
||||
license: Apache2-with-llvm-exception
|
||||
maintainers:
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
prepare() {
|
||||
cd "$BPM_SOURCE"/tools
|
||||
patch -Np1 -i "$BPM_WORKDIR"/enable-fstack-protector-strong-by-default.patch
|
||||
cd "$BPM_SOURCE"/projects/compiler-rt
|
||||
patch -Np2 -i "$BPM_WORKDIR"/remove-linux-scc.h.patch
|
||||
}
|
||||
|
||||
# The build function is executed in the source directory
|
||||
@@ -14,7 +16,7 @@ prepare() {
|
||||
build() {
|
||||
export CC=gcc CXX=g++
|
||||
cmake -B build \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm20 \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm${BPM_PKG_VERSION%%.*} \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||
-DLLVM_ENABLE_FFI=ON \
|
||||
@@ -47,66 +49,66 @@ package_llvm20() {
|
||||
cd "$BPM_OUTPUT"
|
||||
|
||||
# Move compiler-rt files into split package
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/bin/hwasan_symbolize
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/include/fuzzer
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/include/orc
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/include/profile
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/include/sanitizer
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/include/xray
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/lib
|
||||
_pick compiler-rt20 usr/lib/llvm20/lib/clang/${BPM_PKG_VERSION%%.*}/share
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/bin/hwasan_symbolize
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/include/fuzzer
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/include/orc
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/include/profile
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/include/sanitizer
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/include/xray
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/lib
|
||||
_pick compiler-rt${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang/${BPM_PKG_VERSION%%.*}/share
|
||||
|
||||
# Move clang files into split package
|
||||
_pick clang20 usr/lib/llvm20/bin/{amdgpu-arch,analyze-build,c-index-test,diagtool,git-clang-format,hmaptool,intercept-build,nvptx-arch,scan-build,scan-build-py,scan-view}
|
||||
_pick clang20 usr/lib/llvm20/bin/clang*
|
||||
_pick clang20 usr/lib/llvm20/lib/libclang*
|
||||
_pick clang20 usr/lib/llvm20/lib/cmake/clang
|
||||
_pick clang20 usr/lib/llvm20/include/clang-c/
|
||||
_pick clang20 usr/lib/llvm20/include/clang
|
||||
_pick clang20 usr/lib/llvm20/lib/clang
|
||||
_pick clang20 usr/lib/llvm20/share/clang
|
||||
_pick clang20 usr/lib/llvm20/share/man/man1/scan-build.1
|
||||
_pick clang20 usr/lib/llvm20/share/scan-build
|
||||
_pick clang20 usr/lib/llvm20/share/scan-view
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/bin/{amdgpu-arch,analyze-build,c-index-test,diagtool,git-clang-format,hmaptool,intercept-build,nvptx-arch,scan-build,scan-build-py,scan-view}
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/bin/clang*
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/libclang*
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/cmake/clang
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/include/clang-c/
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/include/clang
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/clang
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/share/clang
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/share/man/man1/scan-build.1
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/share/scan-build
|
||||
_pick clang${BPM_PKG_VERSION%%.*} usr/lib/llvm${BPM_PKG_VERSION%%.*}/share/scan-view
|
||||
|
||||
# Move runtime libraries into split package
|
||||
for lib in libLLVM libLLVM-"${BPM_PKG_VERSION%%.*}"; do
|
||||
_pick llvm20-libs usr/lib/llvm20/lib/"$lib".so*
|
||||
_pick llvm${BPM_PKG_VERSION%%.*}-libs usr/lib/llvm${BPM_PKG_VERSION%%.*}/lib/"$lib".so*
|
||||
done
|
||||
|
||||
# Create versioned symlinks from /usr/bin/ to /usr/lib/llvm20/bin/
|
||||
# Create versioned symlinks from /usr/bin/ to /usr/lib/llvm${BPM_PKG_VERSION%%.*}/bin/
|
||||
install -d "$BPM_OUTPUT"/usr/bin
|
||||
local _binary
|
||||
for _binary in "$BPM_OUTPUT"/usr/lib/llvm20/bin/*; do
|
||||
for _binary in "$BPM_OUTPUT"/usr/lib/llvm${BPM_PKG_VERSION%%.*}/bin/*; do
|
||||
local _basename=${_binary##*/}
|
||||
ln -s ../lib/llvm20/bin/"$_basename" "$BPM_OUTPUT"/usr/bin/"$_basename"-20
|
||||
ln -s ../lib/llvm${BPM_PKG_VERSION%%.*}/bin/"$_basename" "$BPM_OUTPUT"/usr/bin/"$_basename"-${BPM_PKG_VERSION%%.*}
|
||||
done
|
||||
|
||||
# Install package license
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/llvm20/LICENSE.TXT
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/llvm${BPM_PKG_VERSION%%.*}/LICENSE.TXT
|
||||
}
|
||||
|
||||
package_llvm20-libs() {
|
||||
# Symlink libraries
|
||||
for lib in libLLVM.so.${BPM_PKG_VERSION%.*} libLLVM-${BPM_PKG_VERSION%%.*}.so; do
|
||||
ln -s llvm20/lib/"$lib" "$BPM_OUTPUT"/usr/lib/"$lib"
|
||||
ln -s llvm${BPM_PKG_VERSION%%.*}/lib/"$lib" "$BPM_OUTPUT"/usr/lib/"$lib"
|
||||
done
|
||||
|
||||
# Install package license
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/llvm20-libs/LICENSE.TXT
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/llvm${BPM_PKG_VERSION%%.*}-libs/LICENSE.TXT
|
||||
}
|
||||
|
||||
package_compiler-rt20() {
|
||||
# Install package license
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/compiler-rt20/LICENSE.TXT
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/compiler-rt${BPM_PKG_VERSION%%.*}/LICENSE.TXT
|
||||
}
|
||||
|
||||
package_clang20() {
|
||||
# Symlink libraries
|
||||
for lib in libclang-cpp.so.${BPM_PKG_VERSION%.*} libclang.so.${BPM_PKG_VERSION%.*}; do
|
||||
ln -s llvm20/lib/"$lib" "$BPM_OUTPUT"/usr/lib/"$lib"
|
||||
ln -s llvm${BPM_PKG_VERSION%%.*}/lib/"$lib" "$BPM_OUTPUT"/usr/lib/"$lib"
|
||||
done
|
||||
|
||||
# Install package license
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/clang20/LICENSE.TXT
|
||||
install -Dm644 "$BPM_SOURCE"/LICENSE.TXT "$BPM_OUTPUT"/usr/share/licenses/clang${BPM_PKG_VERSION%%.*}/LICENSE.TXT
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
From 12239e6eb6f38ee85bed432ecdb92c41481f88c9 Mon Sep 17 00:00:00 2001
|
||||
From: cqwrteur <[email protected]>
|
||||
Date: Sat, 25 Apr 2026 14:23:32 +0800
|
||||
Subject: [PATCH] [compiler-rt][sanitizer] Remove linux/scc.h (#194116)
|
||||
|
||||
#194110
|
||||
|
||||
Linux Kernel has removed scc.h header completely from the source code
|
||||
Therefore, we need to remove the usage in compiler-rt/sanitizer too.
|
||||
https://github.com/torvalds/linux/commit/64edfa65062dc4509ba75978116b2f6d392346f5#diff-1ca78e598a5041ee51ae795d168435afad598b82a7a0ce80f215993589b96c7c
|
||||
|
||||
Without removing it, not only it breaks compiler-rt but also GCC build
|
||||
since GCC always builds libsanitizer for linux targets.
|
||||
|
||||
After merging this we will need to cherry pick to GCC.
|
||||
|
||||
(cherry picked from commit 3dc4fd6dd41100f051a63642f449b16324389c96)
|
||||
---
|
||||
.../sanitizer_platform_limits_posix.cpp | 21 ++++++++-----------
|
||||
1 file changed, 9 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
||||
index ea8cc306268cb..0109df531e88c 100644
|
||||
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
||||
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
||||
@@ -151,16 +151,15 @@ typedef struct user_fpregs elf_fpregset_t;
|
||||
#if defined(__mips64)
|
||||
# include <sys/procfs.h>
|
||||
#endif
|
||||
-#include <sys/user.h>
|
||||
-#include <linux/if_eql.h>
|
||||
-#include <linux/if_plip.h>
|
||||
-#include <linux/lp.h>
|
||||
-#include <linux/mroute.h>
|
||||
-#include <linux/mroute6.h>
|
||||
-#include <linux/scc.h>
|
||||
-#include <linux/serial.h>
|
||||
-#include <sys/msg.h>
|
||||
-#include <sys/ipc.h>
|
||||
+# include <linux/if_eql.h>
|
||||
+# include <linux/if_plip.h>
|
||||
+# include <linux/lp.h>
|
||||
+# include <linux/mroute.h>
|
||||
+# include <linux/mroute6.h>
|
||||
+# include <linux/serial.h>
|
||||
+# include <sys/ipc.h>
|
||||
+# include <sys/msg.h>
|
||||
+# include <sys/user.h>
|
||||
#endif // SANITIZER_ANDROID
|
||||
|
||||
#include <link.h>
|
||||
@@ -532,8 +531,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
||||
unsigned struct_kbsentry_sz = sizeof(struct kbsentry);
|
||||
unsigned struct_mtconfiginfo_sz = sizeof(struct mtconfiginfo);
|
||||
unsigned struct_nr_parms_struct_sz = sizeof(struct nr_parms_struct);
|
||||
- unsigned struct_scc_modem_sz = sizeof(struct scc_modem);
|
||||
- unsigned struct_scc_stat_sz = sizeof(struct scc_stat);
|
||||
unsigned struct_serial_multiport_struct_sz
|
||||
= sizeof(struct serial_multiport_struct);
|
||||
unsigned struct_serial_struct_sz = sizeof(struct serial_struct);
|
||||
Reference in New Issue
Block a user