Merge branch '7' into snapshot

This commit is contained in:
Gianfranco Costamagna 2019-01-03 08:29:54 +01:00
commit 740c688294
3 changed files with 6 additions and 2 deletions

1
debian/changelog vendored
View File

@ -36,6 +36,7 @@ llvm-toolchain-7 (1:7.0.1-4) unstable; urgency=medium
* On old Debian/Ubuntu, run dh_strip using fakeroot to mitigate
a permission issue
* Remove dbgsym packages from debci because of bug #917528
[ Gianfranco Costamagna ]
* Ignore a test result on i386, due to upstream bug 26580#c18

2
debian/rules vendored
View File

@ -705,7 +705,7 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' bin
ln -s $(CURDIR)/debian/llvm-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/bin/llvm-strip $(CURDIR)/strip; \
fi
: # strip segfaults on libFuzzer.a and other libs
PATH=$(CURDIR)/:$$PATH LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ fakeroot dh_strip -a -v
PATH=$(CURDIR)/:$$PATH LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot dh_strip -a -v
: # Remove the workaround
rm $(CURDIR)/strip
: # for some reasons, the +x might be removed

View File

@ -1,3 +1,6 @@
Test-Command: bash -v ./debian/qualify-clang.sh
Depends: @, cmake, g++, file, dpkg-dev, clang-8-dbgsym, libclang1-8-dbgsym
Depends: @, cmake, g++, file, dpkg-dev
# Comment the dbgsym package because of bug #917528
# dbgsym packages not being available in testing
# clang-8-dbgsym, libclang1-8-dbgsym
Restrictions: allow-stderr