Revert "[notify] compiler-rt: path change for clang to find this correctly"

This reverts commit 659b87777e.
This commit is contained in:
Danny Rawlins 2021-08-31 18:40:36 +10:00
parent e39ee816b4
commit c361ad39c0
3 changed files with 31 additions and 35 deletions

View File

@ -1,33 +1,33 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/hwasan_symbolize
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/fuzzer/
-rw-r--r-- root/root usr/include/fuzzer/FuzzedDataProvider.h
drwxr-xr-x root/root usr/include/profile/
-rw-r--r-- root/root usr/include/profile/InstrProfData.inc
drwxr-xr-x root/root usr/include/sanitizer/
-rw-r--r-- root/root usr/include/sanitizer/allocator_interface.h
-rw-r--r-- root/root usr/include/sanitizer/asan_interface.h
-rw-r--r-- root/root usr/include/sanitizer/common_interface_defs.h
-rw-r--r-- root/root usr/include/sanitizer/coverage_interface.h
-rw-r--r-- root/root usr/include/sanitizer/dfsan_interface.h
-rw-r--r-- root/root usr/include/sanitizer/hwasan_interface.h
-rw-r--r-- root/root usr/include/sanitizer/linux_syscall_hooks.h
-rw-r--r-- root/root usr/include/sanitizer/lsan_interface.h
-rw-r--r-- root/root usr/include/sanitizer/msan_interface.h
-rw-r--r-- root/root usr/include/sanitizer/netbsd_syscall_hooks.h
-rw-r--r-- root/root usr/include/sanitizer/scudo_interface.h
-rw-r--r-- root/root usr/include/sanitizer/tsan_interface.h
-rw-r--r-- root/root usr/include/sanitizer/tsan_interface_atomic.h
-rw-r--r-- root/root usr/include/sanitizer/ubsan_interface.h
drwxr-xr-x root/root usr/include/xray/
-rw-r--r-- root/root usr/include/xray/xray_interface.h
-rw-r--r-- root/root usr/include/xray/xray_log_interface.h
-rw-r--r-- root/root usr/include/xray/xray_records.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/clang/
drwxr-xr-x root/root usr/lib/clang/12.0.1/
drwxr-xr-x root/root usr/lib/clang/12.0.1/bin/
-rwxr-xr-x root/root usr/lib/clang/12.0.1/bin/hwasan_symbolize
drwxr-xr-x root/root usr/lib/clang/12.0.1/include/
drwxr-xr-x root/root usr/lib/clang/12.0.1/include/fuzzer/
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/fuzzer/FuzzedDataProvider.h
drwxr-xr-x root/root usr/lib/clang/12.0.1/include/profile/
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/profile/InstrProfData.inc
drwxr-xr-x root/root usr/lib/clang/12.0.1/include/sanitizer/
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/allocator_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/asan_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/common_interface_defs.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/coverage_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/dfsan_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/hwasan_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/linux_syscall_hooks.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/lsan_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/msan_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/netbsd_syscall_hooks.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/scudo_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/tsan_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/tsan_interface_atomic.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/sanitizer/ubsan_interface.h
drwxr-xr-x root/root usr/lib/clang/12.0.1/include/xray/
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/xray/xray_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/xray/xray_log_interface.h
-rw-r--r-- root/root usr/lib/clang/12.0.1/include/xray/xray_records.h
drwxr-xr-x root/root usr/lib/clang/12.0.1/lib/
drwxr-xr-x root/root usr/lib/clang/12.0.1/lib/linux/
-rw-r--r-- root/root usr/lib/clang/12.0.1/lib/linux/clang_rt.crtbegin-i386.o
@ -130,4 +130,3 @@ drwxr-xr-x root/root usr/lib/clang/12.0.1/share/
-rw-r--r-- root/root usr/lib/clang/12.0.1/share/dfsan_abilist.txt
-rw-r--r-- root/root usr/lib/clang/12.0.1/share/hwasan_blacklist.txt
-rw-r--r-- root/root usr/lib/clang/12.0.1/share/msan_blacklist.txt
drwxr-xr-x root/root usr/share/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/f3EovW/snyyl4l4U9IlUk62OlbawfCQjlNod9RnaoViMIQwKqMSymAEPuGlBXvu5uRPOJKsr2/MGuqcJUVKCAM=
SHA256 (Pkgfile) = e7b9282208e15072f6e9d744fcaf63f0b640789d1d6de02046042c9922e17be9
SHA256 (.footprint) = 770941fefc67a171dca7a077978e93b91258996621d0f7cd4d668cbd903e519f
RWSE3ohX2g5d/QiBkMZEriywjAq0ZHSugfsdCKivopEyig9K407cdKl7XOwzjQ3eVsxk6mIRupzlbssxUl4Ox3wE+qMyHCi0OAE=
SHA256 (Pkgfile) = ef28e04b7b40c9fef171d6dcd47e92b608dcc592600f3b1645af7c40a900763a
SHA256 (.footprint) = 1801d50d0e9eb45f14965e4561b3ae0fd4524f8e005f3aeacadd6012f10fa1ea
SHA256 (compiler-rt-12.0.1.src.tar.xz) = b4c8d5f2a802332987c1c0a95b5afb35b1a66a96fe44add4e4ed4792c4cba0a4

View File

@ -5,20 +5,17 @@
name=compiler-rt
version=12.0.1
release=2
release=1
source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/$name-$version.src.tar.xz)
build() {
cmake -S $name-$version.src -B build -G Ninja \
-D CMAKE_INSTALL_PREFIX=/usr \
-D COMPILER_RT_INSTALL_PATH=/usr/lib/clang/$version \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-Wno-dev
cmake --build build
DESTDIR=$PKG cmake --install build
install -d $PKG/usr/lib/clang/$version/{lib,share}
mv $PKG/usr/lib/{linux,clang/$version/lib/}
mv $PKG/usr/{share/*.txt,lib/clang/$version/share/}
}