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

This commit is contained in:
Sylvestre Ledru 2018-08-24 16:04:51 +02:00
commit 9ccb867a7c
3 changed files with 3 additions and 2 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
llvm-toolchain-snapshot (1:8~svn336894-1~exp2) UNRELEASED; urgency=medium
* Force sphinx to be >> 1.2.3
* also ignore libc++experimental.a on dh_strip (fails on stretch)
[ John Paul Adrian Glaubitz ]
* Don't build with ld.gold on powerpcspe

2
debian/control vendored
View File

@ -6,7 +6,7 @@ Uploaders: Sylvestre Ledru <sylvestre@debian.org>
Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9),
lsb-release, patchutils, diffstat, xz-utils, python-dev,
libedit-dev, libncurses5-dev, swig, python-six, python-sphinx (>> 1.2.3),
libedit-dev, libncurses5-dev, swig, python-six, python-sphinx (>= 1.4.9),
binutils-dev,
libjsoncpp-dev, pkg-config,
lcov, procps, help2man, zlib1g-dev,

2
debian/rules vendored
View File

@ -609,7 +609,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++.a -Xlibc++abi.a
dh_strip -a -v -XlibFuzzer.a -Xlibc++.a -Xlibc++abi.a -Xlibc++experimental.a
else
dh_strip -a -v
endif