Allow to build g++ 9 & 10 to fix a gcc build dependency (closes: #955144) And disable thin lto on all archs It needs gcc-8 after after 8 will reject the -flto=thin arg And BOOTSTRAP_LLVM_ENABLE_LTO wil generate .so with llvm IR instead of native code

This commit is contained in:
Sylvestre Ledru 2020-03-31 21:47:36 +02:00
parent 3463a4b84c
commit 35295a2e43
3 changed files with 24 additions and 8 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
llvm-toolchain-9 (1:9.0.1-11) unstable; urgency=medium
* Allow to build g++ 9 & 10 to fix a gcc build dependency (closes: #955144)
And disable thin lto on all archs
It needs gcc-8 after after 8 will reject the -flto=thin arg
And BOOTSTRAP_LLVM_ENABLE_LTO wil generate .so with llvm IR instead
of native code
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 31 Mar 2020 21:11:56 +0200
llvm-toolchain-9 (1:9.0.1-10) unstable; urgency=medium
* debian/patches/947f9692440836dcb8d88b74b69dd379d85974ce.patch:

2
debian/control vendored
View File

@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7
g++-10 | g++-9 | g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7
Build-Conflicts: oprofile, ocaml
Standards-Version: 4.2.1
Homepage: https://www.llvm.org/

20
debian/rules vendored
View File

@ -74,12 +74,13 @@ ifneq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
endif
endif
FORCE_NOT_GCC_9_DISTRO := eoan focal bullseye sid
ifneq (,$(filter $(DISTRO),$(FORCE_NOT_GCC_9_DISTRO)))
# Force gcc before 9 (gcc 8 on Debian unstable) because it causes
# huge increase of the size of the .deb (because of .a and .so) and issues in the libs
GCC_VERSION := 8
endif
# Disable as we don't build with thin lto anymore
# FORCE_NOT_GCC_9_DISTRO := eoan focal bullseye sid
# ifneq (,$(filter $(DISTRO),$(FORCE_NOT_GCC_9_DISTRO)))
# # Force gcc before 9 (gcc 8 on Debian unstable) because it causes
# # huge increase of the size of the .deb (because of .a and .so) and issues in the libs
# GCC_VERSION := 8
# endif
@ -243,7 +244,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
# armhf is not yet quite ready for Thin, it FTBFS
# see https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-8&arch=armhf&ver=1%3A8.0.1%7E%2Brc2-1%7Eexp1&stamp=1560334266&raw=0
ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
CMAKE_EXTRA +=
# Disable thin lto on all archs
# it needs gcc-8 after after 8 will reject the -flto=thin arg
# And BOOTSTRAP_LLVM_ENABLE_LTO wil generate .so with llvm IR instead
# of native code
# -DLLVM_ENABLE_LTO="Thin"
endif
endif
endif