Merge branch 'snapshot' of salsa.debian.org:pkg-llvm-team/llvm-toolchain into snapshot

This commit is contained in:
Sylvestre Ledru 2018-09-20 11:55:17 +02:00
commit ec43f14e25
17 changed files with 109 additions and 70 deletions

79
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-snapshot (1:8~svn342269-2) UNRELEASED; urgency=medium
* Fix the ftbfs under armel on libc++ and enable openmp on armel.
Thanks to Adrian Bunk for the patch
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 19 Sep 2018 15:53:51 +0200
llvm-toolchain-snapshot (1:8~svn342269-1) unstable; urgency=medium
[ Sylvestre Ledru ]
@ -29,29 +36,6 @@ llvm-toolchain-snapshot (1:8~svn342269-1) unstable; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 14 Sep 2018 21:56:57 +0200
llvm-toolchain-7 (1:7~+rc3-1) unstable; urgency=medium
[ John Paul Adrian Glaubitz ]
* Disable OpenMP on unsupported architectures powerpc,
powerpcspe, riscv64 and sparc64 (Closes: #907912)
[ Gianfranco Costamagna ]
* Fix build on armhf, by removing some installed package
* Fix build on s390x, by disabling OpenMP
* Add liblldb-7-dev to python-lldb runtime dependencies, needed to import it
* Enable lld on arm64, mips64el
* Enable lldb on mips64el
[ Reshabh Sharma ]
* Add version for libc++ and OpenMP packages breaks/replaces
* Remove libc++-helpers package
- No real value
- Just two scripts
- Command line arguments aren't that complex
* Fix autopkgtest support
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 06 Sep 2018 10:25:33 +0200
llvm-toolchain-snapshot (1:8~svn340819-1) unstable; urgency=medium
* New snapshot release
@ -102,6 +86,36 @@ 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-2) unstable; urgency=medium
* Fix the ftbfs under armel on libc++ and enable openmp on armel.
Thanks to Adrian Bunk for the patch
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 19 Sep 2018 14:12:34 +0200
llvm-toolchain-7 (1:7-1) unstable; urgency=medium
* Stable release
* Also manages clang-X as tool for scan-build
see https://reviews.llvm.org/D52151
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 17 Sep 2018 13:51:03 +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 ]
@ -115,16 +129,29 @@ llvm-toolchain-7 (1:7~+rc3-2) unstable; urgency=medium
-- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 12 Sep 2018 10:58:12 +0200
llvm-toolchain-7 (1:7~+rc3-1) unstable; urgency=medium
[ John Paul Adrian Glaubitz ]
* Disable OpenMP on unsupported architectures powerpc,
powerpcspe, riscv64 and sparc64 (Closes: #907912)
[ Sylvestre Ledru ]
* New snapshot release
[ Gianfranco Costamagna ]
* Fix build on armhf, by removing some installed package
* Fix build on s390x, by disabling OpenMP
* Add liblldb-7-dev to python-lldb runtime dependencies, needed to import it
* Enable lld on arm64, mips64el
* Enable lldb on mips64el
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 10 Sep 2018 17:01:25 +0200
[ Reshabh Sharma ]
* Add version for libc++ and OpenMP packages breaks/replaces
* Remove libc++-helpers package
- No real value
- Just two scripts
- Command line arguments aren't that complex
* Fix autopkgtest support
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 06 Sep 2018 10:25:33 +0200
llvm-toolchain-7 (1:7~+rc1-1~exp2) experimental; urgency=medium

24
debian/control vendored
View File

@ -484,6 +484,10 @@ Section: libdevel
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
Depends: libomp5-8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-8-doc
Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 7~+rc1-1~exp1)
Conflicts: libomp-dev
Replaces: libomp-dev
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 +497,11 @@ Package: libomp5-8
Multi-Arch: same
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libomp5 (<< 7~+rc1-1~exp1)
Conflicts: libomp5
Replaces: libomp5
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 +529,10 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: clang
Breaks: libc++1 (<< 7~+rc1-1~exp1)
Conflicts: libc++1
Replaces: libc++1
Provides: libc++1
Description: LLVM C++ Standard library
libc++ is another implementation of the C++ standard library.
.
@ -538,6 +551,10 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++1-8 (= ${binary:Version}), ${misc:Depends}
Breaks: libc++-dev (<< 7~+rc1-1~exp1)
Conflicts: libc++-dev
Provides: libc++-dev
Replaces: libc++-dev
Description: LLVM C++ Standard library (development files)
libc++ is another implementation of the C++ standard library
.
@ -559,6 +576,10 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libc++abi1 (<< 7~+rc1-1~exp1)
Conflicts: libc++abi1
Provides: libc++abi1
Replaces: libc++abi1
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 +594,9 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++abi1-8 (= ${binary:Version}), ${misc:Depends}
Breaks: libc++-dev (<= 6.0.1-1)
Provides: libc++abi-dev
Replaces: 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.

View File

@ -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++-@LLVM_VERSION@.a usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so
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++/

View File

@ -1,2 +1,3 @@
/usr/lib/@DEB_HOST_MULTIARCH@/libc++-@LLVM_VERSION@.so /usr/lib/llvm-@LLVM_VERSION@/lib/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++.so /usr/lib/x86_64-linux-gnu/libc++.so
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++

View File

@ -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.*

View File

@ -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/@DEB_HOST_MULTIARCH@/libc++-@LLVM_VERSION@.so.1 /usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1
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++.so.1.0 /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so.1

View File

@ -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

View File

@ -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-@LLVM_VERSION@.a usr/lib/@DEB_HOST_MULTIARCH@/
usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi*so
usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.a
libcxxabi/include/* usr/lib/llvm-@LLVM_VERSION@/include/

View File

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

View File

@ -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.1
usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.*

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5

View File

@ -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-@LLVM_VERSION@.so.5 /usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5
usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5 /usr/lib/@DEB_HOST_MULTIARCH@/libomp.so.5

View File

@ -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

31
debian/rules vendored
View File

@ -42,8 +42,8 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
LIBCXX_EXCEPTIONS :=OFF
endif
ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe))
LDFLAGS_EXTRA += -latomic
ifneq (,$(filter $(DEB_HOST_ARCH),armel mips mipsel powerpc powerpcspe riscv64))
CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-latomic" -DCMAKE_SHARED_LINKER_FLAGS="-latomic"
endif
# Cxx flags for building libcxx and libcxxabi
@ -80,6 +80,8 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armel))
# 3.8 fails to build, disable the compiler_rt builtins
# See http://lists.llvm.org/pipermail/llvm-dev/2016-May/099761.html
CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
# Check for ancient libstdc++ fails due to atomics usage
CMAKE_EXTRA_LIBCXX += -DLLVM_COMPILER_CHECKED=ON
# Prevent clang from getting a > v4t default
# See bug #868779
CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabi
@ -113,7 +115,7 @@ endif
# Enable openmp (or not)
OPENMP_ENABLE=yes
ifneq (,$(filter $(DEB_HOST_ARCH), armel mips mipsel powerpc powerpcspe riscv64 sparc64 s390x x32))
ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel powerpc powerpcspe riscv64 sparc64 s390x x32))
OPENMP_ENABLE=no
endif
@ -349,7 +351,9 @@ LIBCXX_CMAKE_OPTIONS := \
-DCMAKE_AR=$(CURDIR)/$(TARGET_BUILD)/bin/llvm-ar \
-DCMAKE_RANLIB=$(CURDIR)/$(TARGET_BUILD)/bin/llvm-ranlib \
-DCMAKE_C_COMPILER=$(CURDIR)/$(TARGET_BUILD)/bin/clang \
-DLLVM_EXTERNAL_LIT=$(BASE_PATH)/utils/lit/lit.py
-DLLVM_EXTERNAL_LIT=$(BASE_PATH)/utils/lit/lit.py \
$(CMAKE_EXTRA) \
$(CMAKE_EXTRA_LIBCXX)
override_dh_auto_build:
$(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1
@ -463,6 +467,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 +519,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 +631,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 +643,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 -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
else
rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
endif