Create a libpolly-X.Y-dev package

This commit is contained in:
Sylvestre Ledru 2022-12-28 13:19:53 +01:00
parent a3209cea00
commit 519cbc611b
6 changed files with 43 additions and 8 deletions

2
debian/NEWS vendored
View File

@ -1,7 +1,7 @@
llvm-toolchain-14 (1:14.0.6-10) UNRELEASED; urgency=medium 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-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 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 is now arch:any and contains headers
libclang-common-X.Y-dev recommends libclang-rt-X.Y-dev libclang-common-X.Y-dev recommends libclang-rt-X.Y-dev

1
debian/changelog vendored
View File

@ -1,5 +1,6 @@
llvm-toolchain-14 (1:14.0.6-10~exp5) UNRELEASED; urgency=medium 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 * Fix the libclang-rt-14-dev-wasm64 description
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 28 Dec 2022 12:35:04 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Wed, 28 Dec 2022 12:35:04 +0100

17
debian/control vendored
View File

@ -181,6 +181,8 @@ Description: Clang library - Common development package
. .
This package contains the Clang generic headers. This package contains the Clang generic headers.
# ------------- compiler-rt -------------
Package: libclang-rt-14-dev Package: libclang-rt-14-dev
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
@ -221,6 +223,21 @@ Recommends: libclang-common-14-dev (>= 14.0.6-10~exp4)
Description: Compiler-rt - wasm64 builtins Description: Compiler-rt - wasm64 builtins
Provides the compiler-rt builtins for WebAssembly 64 bits 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 Package: libclang-cpp14
Section: libs Section: libs
Architecture: any Architecture: any

17
debian/control.in vendored
View File

@ -181,6 +181,8 @@ Description: Clang library - Common development package
. .
This package contains the Clang generic headers. This package contains the Clang generic headers.
# ------------- compiler-rt -------------
Package: libclang-rt-@LLVM_VERSION@-dev Package: libclang-rt-@LLVM_VERSION@-dev
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
@ -221,6 +223,21 @@ Recommends: libclang-common-@LLVM_VERSION@-dev (>= 14.0.6-10~exp4)
Description: Compiler-rt - wasm64 builtins Description: Compiler-rt - wasm64 builtins
Provides the compiler-rt builtins for WebAssembly 64 bits 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@ Package: libclang-cpp@LLVM_VERSION@
Section: libs Section: libs
Architecture: any Architecture: any

View File

@ -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/*.h
usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap

12
debian/rules vendored
View File

@ -1057,12 +1057,12 @@ endif
# Manage the polly files. Sometimes, we build them. Sometimes not. # Manage the polly files. Sometimes, we build them. Sometimes not.
if test "$(POLLY_ENABLE)" = yes; then \ 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* \ mv -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly* \
$(CURDIR)/debian/libclang-common-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/; \ $(CURDIR)/debian/libpolly-$(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; \ 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/ \ 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 fi
mkdir -p $(CURDIR)/debian/usr/share/doc/llvm-$(LLVM_VERSION)-doc/ $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/ 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: override_dh_install:
ifeq (${POLLY_ENABLE},yes) ifeq (${POLLY_ENABLE},yes)
# only for arch:any builds # only for arch:any builds
ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages))) ifneq (,$(filter libpolly-$(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 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 # On old Debian & Ubuntu, removing the files is necessary
rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
else else