From 519cbc611b4a53487aa236ed1ef53ce62588a8bf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 28 Dec 2022 13:19:53 +0100 Subject: [PATCH] Create a libpolly-X.Y-dev package --- debian/NEWS | 2 +- debian/changelog | 1 + debian/control | 17 +++++++++++++++++ debian/control.in | 17 +++++++++++++++++ debian/libclang-common-X.Y-dev.install.in | 2 +- debian/rules | 12 ++++++------ 6 files changed, 43 insertions(+), 8 deletions(-) diff --git a/debian/NEWS b/debian/NEWS index 5a4965b9..985d4184 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,7 +1,7 @@ llvm-toolchain-14 (1:14.0.6-10) UNRELEASED; urgency=medium * libclang-common-X.Y-dev has been splitted into libclang-rt-X.Y-dev, - libclang-rt-14-dev-wasm32 and libclang-rt-14-dev-wasm64 + libpolly-X.Y-dev, libclang-rt-14-dev-wasm32 and libclang-rt-14-dev-wasm64 compiler-rt and polly moved to libclang-rt-X.Y-dev libclang-common-X.Y-dev is now arch:any and contains headers libclang-common-X.Y-dev recommends libclang-rt-X.Y-dev diff --git a/debian/changelog b/debian/changelog index 9ca0d3e9..ac7392bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ llvm-toolchain-14 (1:14.0.6-10~exp5) UNRELEASED; urgency=medium + * Create a libpolly-X.Y-dev package * Fix the libclang-rt-14-dev-wasm64 description -- Sylvestre Ledru Wed, 28 Dec 2022 12:35:04 +0100 diff --git a/debian/control b/debian/control index 9d58082d..95b20791 100644 --- a/debian/control +++ b/debian/control @@ -181,6 +181,8 @@ Description: Clang library - Common development package . This package contains the Clang generic headers. +# ------------- compiler-rt ------------- + Package: libclang-rt-14-dev Architecture: any Multi-Arch: same @@ -221,6 +223,21 @@ Recommends: libclang-common-14-dev (>= 14.0.6-10~exp4) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits +# ------------- polly ------------- + +Package: libpolly-14-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Breaks: libclang-rt-14-dev (<< 14.0.6-10~exp5), libclang-common-14-dev (<< 14.0.6-10~exp5) +Replaces: libclang-rt-14-dev (<< 14.0.6-10~exp5), libclang-common-14-dev (<< 14.0.6-10~exp5) +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: High-level loop and data-locality optimizer + Uses an abstract mathematical representation based on integer polyhedra + to analyze and optimize the memory access pattern of a program + +# ------------- clang libraries ------------- + Package: libclang-cpp14 Section: libs Architecture: any diff --git a/debian/control.in b/debian/control.in index 42539320..9f19c5ad 100644 --- a/debian/control.in +++ b/debian/control.in @@ -181,6 +181,8 @@ Description: Clang library - Common development package . This package contains the Clang generic headers. +# ------------- compiler-rt ------------- + Package: libclang-rt-@LLVM_VERSION@-dev Architecture: any Multi-Arch: same @@ -221,6 +223,21 @@ Recommends: libclang-common-@LLVM_VERSION@-dev (>= 14.0.6-10~exp4) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits +# ------------- polly ------------- + +Package: libpolly-@LLVM_VERSION@-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Breaks: libclang-rt-@LLVM_VERSION@-dev (<< 14.0.6-10~exp5), libclang-common-@LLVM_VERSION@-dev (<< 14.0.6-10~exp5) +Replaces: libclang-rt-@LLVM_VERSION@-dev (<< 14.0.6-10~exp5), libclang-common-@LLVM_VERSION@-dev (<< 14.0.6-10~exp5) +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: High-level loop and data-locality optimizer + Uses an abstract mathematical representation based on integer polyhedra + to analyze and optimize the memory access pattern of a program + +# ------------- clang libraries ------------- + Package: libclang-cpp@LLVM_VERSION@ Section: libs Architecture: any diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index c856e801..89fbf8a3 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,4 +1,4 @@ -#usr/lib/llvm-@LLVM_VERSION@/include/polly + usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap diff --git a/debian/rules b/debian/rules index 6bfb8f81..ca5b96d2 100755 --- a/debian/rules +++ b/debian/rules @@ -1057,12 +1057,12 @@ endif # Manage the polly files. Sometimes, we build them. Sometimes not. if test "$(POLLY_ENABLE)" = yes; then \ - mkdir -p $(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly/; \ + mkdir -p $(CURDIR)/debian/libclang-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/ $(CURDIR)/debian/libpolly-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly/; \ mv -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly* \ - $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ - rm -rf $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly; \ + $(CURDIR)/debian/libpolly-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ + rm -rf $(CURDIR)/debian/libpolly-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/polly; \ mv -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/polly/ \ - $(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/; \ + $(CURDIR)/debian/libpolly-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/include/; \ fi mkdir -p $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/ $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/ @@ -1155,8 +1155,8 @@ endif override_dh_install: ifeq (${POLLY_ENABLE},yes) # only for arch:any builds -ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages))) - dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly +ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(shell dh_listpackages))) + dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly # On old Debian & Ubuntu, removing the files is necessary rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake else