From e8e3d013e460b1ee2eb49869a2eda2d2b18e696a Mon Sep 17 00:00:00 2001 From: B Stack Date: Wed, 28 Aug 2019 15:41:33 -0400 Subject: palemoon dpkg use gcc-8 because beowulf/ceres has gcc9 which somehow breaks palemoon now all of a sudden. I thought the Fedora release was working with gcc9. I ripped off some logic from palemoon-28.0.1 and palemoon-27.7.1 from stevepusser to force gcc8. --- palemoon/debian/changelog | 6 ++++++ palemoon/debian/control | 2 +- palemoon/debian/rules | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'palemoon') diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog index 4c04927..eadb898 100644 --- a/palemoon/debian/changelog +++ b/palemoon/debian/changelog @@ -1,3 +1,9 @@ +palemoon (28.6.1-3+devuan) obs; urgency=medium + + * Specify gcc-8 on debian buster which is the upstream for beowulf/ceres. + + -- B Stack Thu, 25 Jul 2019 13:03:15 -0400 + palemoon (28.6.1-2+devuan) obs; urgency=medium * Add override for dh_strip_nondeterminism to address build failures with the diff --git a/palemoon/debian/control b/palemoon/debian/control index eca609c..77889b3 100644 --- a/palemoon/debian/control +++ b/palemoon/debian/control @@ -6,7 +6,7 @@ Bugs: mailto: XSBC-Original-Maintainer: Steven Pusser Build-Depends: autoconf2.13, debhelper (>= 9), - gcc (>= 4.9), + gcc-8, g++-8, cpp-8, libasound2-dev, libbz2-dev, libdbus-glib-1-dev (>= 0.60), diff --git a/palemoon/debian/rules b/palemoon/debian/rules index 2a74bf0..b56d4f7 100755 --- a/palemoon/debian/rules +++ b/palemoon/debian/rules @@ -2,6 +2,16 @@ export SHELL=/bin/bash +# borrowed from stevepusser's logic +# Build with gcc-8 on Buster (beowulf/ceres) +distrelease := $(shell lsb_release -cs) +ifeq ($(distrelease),$(filter $(distrelease),buster beowulf/ceres)) +export CC=gcc-8 +export CXX=g++-8 +export CPP=cpp-8 +export LD=gcc-8 +endif + %: dh $@ -- cgit