proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 11:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/16' into snapshot

Browse Source
This commit is contained in:
Sylvestre Ledru 2023-07-09 17:24:54 +02:00
commit 8f41bfddae
9 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
debian/changelog vendored
View File

@ -50,6 +50,23 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 28 Jan 2023 18:07:40 +0100
llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* Fix hurd build by fixing Linux-specific lines.
-- Samuel Thibault <sthibault@debian.org> Sun, 09 Jul 2023 17:03:24 +0200
llvm-toolchain-16 (1:16.0.6-4) unstable; urgency=medium
* lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490)
* Unbreak the libclang links (Closes: #1040205)
And add tests to make sure we don't regress
* Fix the libclang-16.so symbol file
* Remove broken symlinks (closes: #857680)
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 09 Jul 2023 15:08:24 +0200
llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium
[ Sylvestre Ledru ]
@ -305,7 +322,7 @@ llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium
llvm-toolchain-15 (1:15.0.7-5~exp2) experimental; urgency=medium
* Also apply the workround of issue #62621 for focal
* Also apply the workaround of issue #62621 for focal
and to include libpolly-15-dev
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 10 Jun 2023 11:52:14 +0200
@ -409,7 +426,7 @@ llvm-toolchain-15 (1:15.0.6-5~exp1) experimental; urgency=medium
$ apt install clang-15 lld-15 libclang-rt-15-dev-wasm32 wasi-libc
$ clang-15 --target=wasm32-wasi helloworld.c -o helloworld.wasm
Many thanks to Faidon Liambotis
* libclang-common-15-dev splitted into different packages:
* libclang-common-15-dev split into different packages:
- libclang-rt-15-dev
- libpolly-15-dev
- libclang-rt-15-dev-wasm32
@ -466,7 +483,7 @@ llvm-toolchain-15 (1:15.0.5-2) unstable; urgency=medium
[ Gianfranco Costamagna ]
* Add libomp target library to mips64el (Closes: #1023101)
* Explictly depend on spirv-14 for mips64el, to ease bootstrapping
* Explicitly depend on spirv-14 for mips64el, to ease bootstrapping
on buildds (this should be dropped once we build a spirv-15 in archive)
* Cherry-pick two upstream patches to unblock mesa build on arm* (Closes:
#1022577)
@ -4336,7 +4353,7 @@ llvm-toolchain-7 (1:7-6~exp1) experimental; urgency=medium
opt-viewer.py needs it
* Add back libomp5-X.Y.symbols.in (untested)
* Fix the install of clang bash completion
* Start the work on bootstraping clang
* Start the work on bootstrapping clang
- bootstrap-with-openmp-version-export-missing.diff: fix a link issue
https://bugs.llvm.org/show_bug.cgi?id=39200
- bootstrap-fix-include-next.diff: Fix an include issue at bootstrap phase

2
debian/control vendored
View File

@ -562,7 +562,7 @@ Description: LLVM-based linker, header files
Package: lldb-17
Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}), llvm-17-dev,
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
python3-lldb-17
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger

2
debian/control.in vendored
View File

@ -562,7 +562,7 @@ Description: LLVM-based linker, header files
Package: lldb-@LLVM_VERSION@
Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), llvm-@LLVM_VERSION@-dev,
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
python3-lldb-@LLVM_VERSION@
Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger

6
debian/libclang-X.Y-dev.links.in vendored
View File

@ -1,3 +1,3 @@
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so

2
debian/libclang-rt-X.Y-dev.install.in vendored
View File

@ -2,7 +2,7 @@
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/*clang_rt*
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt*
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h

1
debian/libclang1-X.Y.install.in vendored
View File

@ -1,2 +1 @@
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1* /usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1

3
debian/llvm-X.Y-examples.links.in vendored
View File

@ -1,3 +0,0 @@
/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.common usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.common
/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.config usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.config
/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.rules usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.rules

19
debian/qualify-clang.sh vendored
View File

@ -477,8 +477,23 @@ if ! ldd o 2>&1|grep -q libclang-cpp; then
fi
./o > /dev/null
# Check that the symlink is correct
ls -al /usr/lib/llvm-$VERSION/lib/libclang-cpp.so.$VERSION > /dev/null
check_symlink() {
P="/usr/lib/llvm-$VERSION/lib/$1"
if test ! -e $P; then
echo "invalid symlink $P"
ls -al $P
exit 1
fi
}
check_symlink "libclang-cpp.so.$VERSION"
check_symlink "libclang-$VERSION.so"
check_symlink "libclang.so"
echo "Testing python clang ..."
python3 -c 'from ctypes import *; import clang.cindex; config = clang.cindex.Config(); verfunc = config.lib.clang_getClangVersion; verfunc.restype = c_char_p ; print(verfunc())'
echo "Testing code coverage ..."

28
debian/rules vendored
View File

@ -181,11 +181,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386))
CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu
endif
ifneq (,$(filter $(DEB_HOST_ARCH),i386))
# Sometimes, i386 needs help with the triple
CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu
endif
ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
# avoid an issue with search path on mips64el
# https://bugs.llvm.org/show_bug.cgi?id=41204
@ -557,24 +552,6 @@ preconfigure:
debian/llvm-$(LLVM_VERSION)-linker-tools.links \
debian/libbolt-$(LLVM_VERSION)-dev.install
# workaround the breaks/replaces/conflicts introduced with the omp-device-info move
# we update the version to make it work with apt.llvm.org
# Yeah, this is ugly but I don't know how to do better
if test "$(LLVM_VERSION)" = "13"; then \
if echo "$(LLVM_VERSION_SNAPSHOT)"|grep -q "++"; then \
sed -i -e "s|(<< 1:13.0.0-4)|(<< 1:13.0.0~++20211013044936)|g" debian/control; \
fi; \
fi
# workaround the breaks/replaces/conflicts
# https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755
# Yeah, this is ugly but I don't know how to do better
if test "$(DISTRO)" = "jammy" -o "$(DISTRO)" = "kinetic" -o "$(DISTRO)" = "focal"; then \
if test "$(LLVM_VERSION)" = "15"; then \
sed -i -e "s|libclang-common-15-dev (<< 1:15.0.6-5)|libclang-common-15-dev (<< 1:15.0.6-5), libclang-common-15-dev (= 1:15.0.7-0ubuntu0.22.04.1), libpolly-15-dev (= 1:15.0.7-0ubuntu0.22.04.1)|g" debian/control; \
fi; \
fi
ifdef LLVM_SPIRV
# llvm-spirv was found, so we can enable *.spv files. Debian
# buster and Ubuntu 18.04 don't have llvm-spirv to create the
@ -1045,11 +1022,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux))
endif
endif
: # libclang
cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \
ln -s libclang-$(LLVM_VERSION).so.$(LLVM_VERSION) libclang.so.$(SONAME_EXT) && \
ln -s libclang-$(LLVM_VERSION).so.$(LLVM_VERSION) libclang-$(LLVM_VERSION).so.$(SONAME_EXT)
if test "$(LIBUNWIND_ENABLE)" = yes; then \
mkdir -p debian/tmp/usr/include/libunwind; \
cp -R libunwind/include/* debian/tmp/usr/include/libunwind/; \