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

This commit is contained in:
Sylvestre Ledru 2019-09-11 22:23:24 +02:00
commit 1e493280ef
3 changed files with 9 additions and 4 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-9 (1:9~+rc4-1~exp1) experimental; urgency=medium
* New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 10 Sep 2019 15:25:46 +0200
llvm-toolchain-9 (1:9~+rc3-1~exp3) experimental; urgency=medium
* Force gcc before 9 (gcc 8 on Debian unstable) because it causes

2
debian/control vendored
View File

@ -89,8 +89,6 @@ Package: clangd-9
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
libclang-common-9-dev (= ${binary:Version})
Replaces: clang-tools-9 (<< 1:9~+rc1-1~exp2)
Breaks: clang-tools-9 (<< 1:9~+rc1-1~exp2)
Description: Language server that provides IDE-like features to editors
clangd understands your C++ code and adds smart features to your editor:
- code completion

5
debian/rules vendored
View File

@ -67,8 +67,8 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++
GCC_VERSION := 4.9
endif
FORCE_NOT_GCC_9_DISTRO := eoan bullseye
ifeq (,$(filter $(DISTRO), $(FORCE_NOT_GCC_9_DISTRO)))
FORCE_NOT_GCC_9_DISTRO := eoan bullseye sid
ifneq (,$(filter $(DISTRO),$(FORCE_NOT_GCC_9_DISTRO)))
# Force gcc-8
GCC_VERSION := 8
endif
@ -278,6 +278,7 @@ preconfigure:
@echo "DEB_HOST_ARCH=$(DEB_HOST_ARCH)"
@echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)"
@echo "DISTRO=$(DISTRO)"
@echo "GCC_VERSION=$(GCC_VERSION)"
for f in debian/*.in; do \
f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \