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

This commit is contained in:
Sylvestre Ledru 2019-09-07 13:02:07 +02:00
parent 48faa9b828
commit a4bb047604
4 changed files with 15 additions and 7 deletions

7
debian/changelog vendored
View File

@ -1,9 +1,8 @@
llvm-toolchain-9 (1:9~+rc3-1~exp3) experimental; urgency=medium
* Try to disable some options specific to BOOTSTRAP_LLVM_ENABLE_LTO
which aren't activated for LLVM_ENABLE_LTO causing the usage
of llvm-ar llvm-ranlib. Causing a huge increase of the size
of the .deb (because of .a and .so) and issues in the libs
* 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
(Closes: #939472)
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Sep 2019 23:27:28 +0200

3
debian/control vendored
View File

@ -18,7 +18,8 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x],
libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x],
libpfm4-dev, python3-setuptools
libpfm4-dev, python3-setuptools,
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/

View File

@ -129,4 +129,4 @@ bootstrap-fix-include-next.diff
clang-riscv64-multiarch.diff
clang-riscv64-rv64gc.diff
try-to-unbreak-thinlto.diff
#try-to-unbreak-thinlto.diff

10
debian/rules vendored
View File

@ -67,6 +67,14 @@ 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 gcc-8
GCC_VERSION := 8
endif
export CC=gcc-$(GCC_VERSION)
export CXX=g++-$(GCC_VERSION)
@ -230,7 +238,7 @@ 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 += -DBOOTSTRAP_LLVM_ENABLE_LTO="Thin"
CMAKE_EXTRA += -DLLVM_ENABLE_LTO="Thin"
endif
endif
endif