mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-31 09:30:24 +00:00
* libclang1-17: Only encode the major version in the soname. Closes: #1056126.
This commit is contained in:
parent
d2e2ed9cdb
commit
5cda29f509
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -5,6 +5,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium
|
||||
* Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not
|
||||
yet built on these architectures).
|
||||
* Fix stripping build flags on Ubuntu/ppc64el.
|
||||
* libclang1-17: Only encode the major version in the soname. Closes: #1056126.
|
||||
|
||||
[ Sylvestre Ledru ]
|
||||
* Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a
|
||||
|
6
debian/libclang-X.Y-dev.links.in
vendored
6
debian/libclang-X.Y-dev.links.in
vendored
@ -1,3 +1,3 @@
|
||||
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
|
||||
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
|
||||
|
6
debian/libclang1-X.Y.links.in
vendored
6
debian/libclang1-X.Y.links.in
vendored
@ -1,4 +1,4 @@
|
||||
# as upstream
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1
|
||||
usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@
|
||||
usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1
|
||||
|
2
debian/libclang1-X.Y.symbols.in
vendored
2
debian/libclang1-X.Y.symbols.in
vendored
@ -1,4 +1,4 @@
|
||||
libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER#
|
||||
libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER#
|
||||
(optional)LLVM_13@LLVM_13 1:15.0.7-3
|
||||
(optional)LLVM_16@LLVM_16 1:16.0.2-1
|
||||
(optional)LLVM_17@LLVM_17 1:17.0.1-1
|
||||
|
11
debian/patches/libclang-major-version-only.diff
vendored
Normal file
11
debian/patches/libclang-major-version-only.diff
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/clang/tools/libclang/CMakeLists.txt
|
||||
+++ b/clang/tools/libclang/CMakeLists.txt
|
||||
@@ -196,7 +196,7 @@
|
||||
OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map)
|
||||
|
||||
set_target_properties(libclang PROPERTIES
|
||||
- VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}
|
||||
+ VERSION ${LLVM_VERSION_MAJOR}
|
||||
${LIBCLANG_SOVERSION_ARG})
|
||||
endif()
|
||||
endif()
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -149,3 +149,4 @@ bolt-disable-emit-relocs.patch
|
||||
link-grpc.diff
|
||||
D158066-simd-ppc64el.patch
|
||||
ubuntu-releases.patch
|
||||
libclang-major-version-only.diff
|
||||
|
4
debian/rules
vendored
4
debian/rules
vendored
@ -13,12 +13,14 @@ GXX_VERSIONED_PACKAGE := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o
|
||||
GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 )
|
||||
GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE))
|
||||
|
||||
LLVM_EPOCH := 1:
|
||||
LLVM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p")
|
||||
LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p")
|
||||
LLVM_VERSION_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p")
|
||||
ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL))
|
||||
LLVM_VERSION_FULL := $(LLVM_VERSION).0.0
|
||||
endif
|
||||
LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}')
|
||||
|
||||
SOURCE_NAME := $(shell dpkg-parsechangelog -S Source)
|
||||
ifneq (,$(findstring snapshot,$(SOURCE_NAME)))
|
||||
@ -604,7 +606,9 @@ stamps/preconfigure:
|
||||
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
|
||||
-e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \
|
||||
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
|
||||
-e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \
|
||||
-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
|
||||
-e "s|@LLVM_VERSION_NEXT@|$(LLVM_VERSION_NEXT)|g" \
|
||||
-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
|
||||
done
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user