Merge remote-tracking branch 'origin/7' into snapshot

debian/changelog

@@ -102,6 +102,24 @@ llvm-toolchain-snapshot (1:8~svn340819-1) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 28 Aug 2018 16:28:24 +0200
 
+<<<<<<<
+=======
+llvm-toolchain-7 (1:7~+rc3-4) unstable; urgency=medium
+
+  [ Sylvestre Ledru ]
+  * libc++-7-dev doesn't provide libstdc++-dev anymore (Closes: #908738)
+
+  [ Gianfranco Costamagna ]
+  * Force polly cmake removal on arch:all because of --fail-missing
+
+  [ John Paul Adrian Glaubitz ]
+  * Add patch to fix missing MultiArch include dir
+    on powerpcspe (Closes: #908791)
+  * Disable LLDB on riscv64
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 14 Sep 2018 11:27:28 +0200
+
+>>>>>>>
 llvm-toolchain-7 (1:7~+rc3-2) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
@@ -286,6 +304,24 @@ llvm-toolchain-snapshot (1:7~svn322880-1) unstable; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jan 2018 20:50:03 +0100
 
+llvm-toolchain-6.0 (1:6.0.1-10) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Add patch to fix missing include and library paths on x32
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Sat, 15 Sep 2018 09:35:13 +0200
+
+llvm-toolchain-6.0 (1:6.0.1-9) unstable; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * Add patch to fix missing MultiArch include dir
+    on powerpcspe (Closes: #908791)
+
+  [ Gianfranco Costamagna ]
+  * Force polly cmake removal on arch:all because of --fail-missing
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Fri, 14 Sep 2018 09:24:02 +0200
+
 llvm-toolchain-6.0 (1:6.0.1-8) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]

debian/control

@@ -484,6 +484,9 @@ Section: libdevel
 Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
 Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-8-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
@@ -493,6 +496,10 @@ Package: libomp5-8
 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
@@ -520,6 +527,9 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: clang
+Replaces: libc++1 (<< 7~+rc1-1~exp1)
+Breaks: libc++1 (<< 7~+rc1-1~exp1)
+Provides: libc++1
 Description: LLVM C++ Standard library
  libc++ is another implementation of the C++ standard library.
  .
@@ -538,6 +548,9 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends}
+Provides: libc++-dev
+Breaks: libc++-dev (<< 7~+rc1-1~exp1)
+Replaces: libc++-dev (<< 7~+rc1-1~exp1)
 Description: LLVM C++ Standard library (development files)
  libc++ is another implementation of the C++ standard library
  .
@@ -559,6 +572,9 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libc++abi1 (<< 7~+rc1-1~exp1)
+Provides: libc++abi1
+Replaces: libc++abi1 (<< 7~+rc1-1~exp1)
 Description: LLVM low level support for a standard C++ library
  libc++abi is another implementation of low level support for a standard C++
  library.
@@ -573,6 +589,9 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends}
+Replaces: libc++-dev (<= 6.0.1-1), libc++abi-dev (<= 6.0.1-1)
+Breaks: libc++-dev (<= 6.0.1-1), libc++abi-dev (<= 6.0.1-1)
+Provides: libc++abi-dev
 Description: LLVM low level support for a standard C++ library (development files)
  libc++abi is another implementation of low level support for a standard C++
  library.

debian/libc++-X.Y-dev.install.in

@@ -1,5 +1,5 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++-@LLVM_VERSION@.so	usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++-@LLVM_VERSION@.a	usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++fs.a
 usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a
 usr/lib/llvm-@LLVM_VERSION@/include/c++/ 

debian/libc++-X.Y-dev.links.in

@@ -1,2 +1,3 @@
-/usr/lib/@DEB_HOST_MULTIARCH@/libc++-@LLVM_VERSION@.so	/usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so 
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so /usr/lib/x86_64-linux-gnu/libc++.so
-/usr/lib/@DEB_HOST_MULTIARCH@/libc++-@LLVM_VERSION@.a	/usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a /usr/lib/x86_64-linux-gnu/libc++.a
+usr/lib/llvm-@LLVM_VERSION@/include/c++ /usr/include/c++

debian/libc++1-X.Y.install.in

@@ -1 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++-@LLVM_VERSION@.so.*	usr/lib/@DEB_HOST_MULTIARCH@
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.*

debian/libc++1-X.Y.links.in

@@ -1,2 +1,2 @@
-/usr/lib/@DEB_HOST_MULTIARCH@/libc++-@LLVM_VERSION@.so.1.0	/usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0
-/usr/lib/@DEB_HOST_MULTIARCH@/libc++-@LLVM_VERSION@.so.1	/usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1
+/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1

debian/libc++1-X.Y.lintian-overrides.in

@@ -1,2 +1 @@
 libc++1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0
-libc++1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libc++.so.1 usr/lib/*/libc++-@LLVM_VERSION@.so.1.0 libc++.so.1

debian/libc++abi-X.Y-dev.install.in

@@ -1,3 +1,3 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi-@LLVM_VERSION@*so	usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi-@LLVM_VERSION@.a	usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a
 libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/

debian/libc++abi-X.Y-dev.links.in

@@ -1,2 +1 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libc++abi-@LLVM_VERSION@.so	usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so
-usr/lib/@DEB_HOST_MULTIARCH@/libc++abi-@LLVM_VERSION@.a		usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a

debian/libc++abi1-X.Y.install.in

@@ -1,2 +1 @@
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi-@LLVM_VERSION@.so.*	usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.*
-usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1

debian/libc++abi1-X.Y.links.in

@@ -1 +1,2 @@
-/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi-@LLVM_VERSION@.so.1.0	/usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0
+usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0  /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0
+/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1.0	/usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so.1

debian/libc++abi1-X.Y.lintian-overrides.in

@@ -1,2 +1 @@
 libc++abi1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0
-libc++abi1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libc++abi.so.1 usr/lib/*/libc++abi-@LLVM_VERSION@.so.1.0 libc++abi.so.1

debian/libomp-X.Y-dev.links.in

@@ -1,5 +0,0 @@
-/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

debian/libomp5-X.Y.install.in

@@ -1,3 +1 @@
-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

debian/libomp5-X.Y.links.in

@@ -1,2 +1,3 @@
-/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.so.5  /usr/lib/@DEB_HOST_MULTIARCH@/libomp.so.5
-/usr/lib/llvm-@LLVM_VERSION@/lib/libomp-@LLVM_VERSION@.so.5	/usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5
+
+

debian/libomp5-X.Y.lintian-overrides.in

@@ -1,2 +1 @@
 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

debian/rules

@@ -463,6 +463,9 @@ 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
+
 	if test "$(OPENMP_ENABLE)" = yes; then \
 		mkdir -p debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \
 		cp -f openmp/runtime/exports/common*/include/* debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/include/openmp; \
@@ -512,18 +515,6 @@ endif
 	$(MAKE) -C libcxxabi/build install DESTDIR=$(DEB_INST)
 	$(MAKE) -C libcxx/build install DESTDIR=$(DEB_INST)
 
-# hack to make them co installable
-	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/
 	cd $(DEB_INST)/usr/bin/; \
@@ -636,7 +627,7 @@ endif
 # endif
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.28 ; echo $$?),0)
 # strip segfaults on libFuzzer.a
-	dh_strip -a -v -XlibFuzzer.a -Xlibc++-$(LLVM_VERSION).a -Xlibc++abi-$(LLVM_VERSION).a -Xlibc++experimental.a
+	dh_strip -a -v -XlibFuzzer.a -Xlibc++.a -Xlibc++abi.a -Xlibc++experimental.a
 else
 	dh_strip -a -v
 endif
@@ -648,6 +639,8 @@ 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
+# On old Debian & Ubuntu, removing the files is necessary
+	rm debian/tmp/usr/lib/llvm-$(VERSION)/lib/cmake/polly/*.cmake
 else
 	rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
 endif