diff --git a/debian/changelog b/debian/changelog index fa0a1bbb..c669ca4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ llvm-toolchain-7 (1:7~+rc3-4) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * libc++-7-dev doesn't provide libstdc++-dev anymore (Closes: #908738) + [ Reshabh Sharma ] + * Make OpenMP packages coinstallable + -- Sylvestre Ledru Thu, 13 Sep 2018 15:26:41 +0200 llvm-toolchain-7 (1:7~+rc3-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 3c791506..09907be8 100644 --- a/debian/control +++ b/debian/control @@ -484,9 +484,6 @@ Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 Depends: libomp5-7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-7-doc -Replaces: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1) -Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1) -Provides: libomp-dev Description: LLVM OpenMP runtime - dev package The runtime is the part of the OpenMP implementation that your code is linked against, and that manages the multiple threads in an OpenMP program @@ -496,10 +493,6 @@ Package: libomp5-7 Multi-Arch: same Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libomp5 (<< 7~+rc1-1~exp1) -Breaks: libomp5 (<< 7~+rc1-1~exp1) -Provides: libomp5 -# TODO add the break depends Description: LLVM OpenMP runtime The runtime is the part of the OpenMP implementation that your code is linked against, and that manages the multiple threads in an OpenMP program diff --git a/debian/libomp-X.Y-dev.links.in b/debian/libomp-X.Y-dev.links.in new file mode 100644 index 00000000..c80fc42e --- /dev/null +++ b/debian/libomp-X.Y-dev.links.in @@ -0,0 +1,5 @@ +/usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so /usr/lib/@DEB_HOST_MULTIARCH@/libgomp-@LLVM_VERSION@.so +/usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so /usr/lib/@DEB_HOST_MULTIARCH@/libiomp5-@LLVM_VERSION@.so +/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 /usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so +/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so /usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so +/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so /usr/lib/@DEB_HOST_MULTIARCH@/libomp-@LLVM_VERSION@.so diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in index 19af41ce..da0e4b23 100644 --- a/debian/libomp5-X.Y.install.in +++ b/debian/libomp5-X.Y.install.in @@ -1 +1,3 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 +usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 +usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5 diff --git a/debian/libomp5-X.Y.links.in b/debian/libomp5-X.Y.links.in index cd9227f0..9f83f576 100644 --- a/debian/libomp5-X.Y.links.in +++ b/debian/libomp5-X.Y.links.in @@ -1,3 +1,2 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 /usr/lib/@DEB_HOST_MULTIARCH@/libomp.so.5 - - +/usr/lib/@DEB_HOST_MULTIARCH@/libomp-@LLVM_VERSION@.so.5 /usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5 +/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5 /usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 diff --git a/debian/libomp5-X.Y.lintian-overrides.in b/debian/libomp5-X.Y.lintian-overrides.in index 201d42dc..fc7612b7 100644 --- a/debian/libomp5-X.Y.lintian-overrides.in +++ b/debian/libomp5-X.Y.lintian-overrides.in @@ -1 +1,2 @@ libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 +libomp5-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libomp.so.5 usr/lib/*/libomp-@LLVM_VERSION@.so.5 libomp.so.5 diff --git a/debian/rules b/debian/rules index 4e4a77af..d4cc6d48 100755 --- a/debian/rules +++ b/debian/rules @@ -463,8 +463,7 @@ override_dh_auto_install: cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT) - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ - ln -s libomp.so.$(SONAME_OPENMP) libomp.so + cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && cp libomp.so.$(SONAME_OPENMP) libomp-$(LLVM_VERSION).so.$(SONAME_OPENMP); if test "$(OPENMP_ENABLE)" = yes; then \ mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \ @@ -513,6 +512,17 @@ endif $(MAKE) -C libcxxabi/build install DESTDIR=$(DEB_INST) $(MAKE) -C libcxx/build install DESTDIR=$(DEB_INST) + + cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libc++.so.1.0 libc++-$(LLVM_VERSION).so.1.0; \ + mv libc++.so libc++-$(LLVM_VERSION).so; \ + mv libc++.a libc++-$(LLVM_VERSION).a; \ + mv libc++abi.so.1.0 libc++abi-$(LLVM_VERSION).so.1.0; \ + mv libc++abi.a libc++abi-$(LLVM_VERSION).a; \ + rm libc++.so.1 libc++abi.so libc++abi.so.1; \ + ln -s libc++-$(LLVM_VERSION).so.1.0 libc++-$(LLVM_VERSION).so.1; \ + ln -s libc++abi-$(LLVM_VERSION).so.1.0 libc++abi-$(LLVM_VERSION).so.1; \ + ln -s libc++abi-$(LLVM_VERSION).so.1 libc++abi-$(LLVM_VERSION).so; \ + ln -s libc++abi-$(LLVM_VERSION).so.1 libc++abi.so.1 # Rename binaries mkdir -p $(DEB_INST)/usr/bin/