diff --git a/debian/changelog b/debian/changelog index 7a728109..83d48833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:15~++20220724113059+7feab85df8e8-1~exp2) UNRELEASED; urgency=medium + + * clang doesn't have a specific SONAME anymore. + See https://reviews.llvm.org/D129160 for the rational + + -- Sylvestre Ledru Tue, 26 Jul 2022 13:00:12 +0200 + llvm-toolchain-snapshot (1:15~++20220724113059+7feab85df8e8-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index a11d343c..f96ef90e 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -14,7 +14,7 @@ for F in $LIST; do done echo "once you copy the old version into a new branch" -echo "edit debian/rules, maybe update SONAME_CLANG" +echo "edit debian/rules" echo "edit debian/control, update the VCS links" echo "edit debian/control, update the source pkg name" echo "edit debian/changelog, update the source pkg name" diff --git a/debian/rules b/debian/rules index 20305fda..0e653006 100755 --- a/debian/rules +++ b/debian/rules @@ -21,10 +21,6 @@ ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) endif SONAME_EXT := 1 -# clang soname has started with llvm-toolchain-13. -# it is normal that 13 is what is seen in 14 or later version as -# it is bumped only with abi changes -SONAME_CLANG := 13 SONAME_OPENMP := 5 # Manage the case when the version is 3.5~svn213052-1~exp1 or 3.4.2-1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p") @@ -781,8 +777,7 @@ override_dh_auto_install: : # libclang cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ - ln -s libclang-$(LLVM_VERSION).so.$(SONAME_CLANG) libclang.so.$(SONAME_EXT) && \ - ln -s libclang-$(LLVM_VERSION).so.$(SONAME_CLANG) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) + ln -s libclang-$(LLVM_VERSION).so.$(LLVM_VERSION) libclang.so.$(SONAME_EXT) if test "$(LIBUNWIND_ENABLE)" = yes; then \ mkdir -p debian/tmp/usr/include/libunwind; \