From f1545226aa560e1ef5238fdd887d2d1a23276770 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 17 Nov 2020 19:00:01 +0000 Subject: [PATCH] build: Compile using gcc-4.8 on scout scout defaults to gcc 4.6, but that version produces spurious warnings for g_set_object(). Signed-off-by: Simon McVittie <smcv@collabora.com> --- debian/control | 1 + debian/gitlab-ci.yml | 1 + debian/rules | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/control b/debian/control index 9cda84983..d04e547b3 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Standards-Version: 4.3.0 Build-Depends: debhelper (>= 9), g++ (>= 4:4.8) | g++-4.8, + gcc (>= 4:4.8) | gcc-4.8, glslang-tools, gtk-doc-tools <!nodoc>, libcapsule-tools, diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml index d8c00730d..862381cb2 100644 --- a/debian/gitlab-ci.yml +++ b/debian/gitlab-ci.yml @@ -147,6 +147,7 @@ build:devel: ${NULL+} # g++ 4.6 is too old (see also debian/rules) + export CC=gcc-4.8 export CXX=g++-4.8 mkdir -p -m700 "${STEAM_CI_TMPDIR}" diff --git a/debian/rules b/debian/rules index c9238ea77..4d18e1f9b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ export LC_ALL=C.UTF-8 include /usr/share/dpkg/default.mk ifeq ($(shell dpkg --compare-versions `c++ -dumpversion || echo 0` ge 4.8 || echo old),old) +export CC = gcc-4.8 export CXX = g++-4.8 endif -- GitLab