[X2Go-Commits] [pale-moon] 01/03: debian/rules: use gcc-6 on newer distro versions, and gcc-4.9 on older ones.
git-admin at x2go.org
git-admin at x2go.org
Thu Aug 30 05:10:04 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pale-moon.
commit 6b5ec48bad7d72240d234503981ea9091d394dcd
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Aug 30 04:59:44 2018 +0200
debian/rules: use gcc-6 on newer distro versions, and gcc-4.9 on older ones.
Switch to using the DIST variable since we have that now.
---
debian/changelog | 2 ++
debian/rules | 14 ++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0c66589..a6cf36c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
- Remove FIXME entry for MPL, downstream seems to do it wrongly, but it's
not causing harm, so just keep it.
- Ignore js/src/build/autoconf/config.{guess,sub} if they do not exist.
+ - Use gcc-6 on newer distro versions, and gcc-4.9 on older ones. Switch to
+ using the DIST variable since we have that now.
* debian/mozconfig:
- Remove autoconf flags that should better be handled by debian/rules.
* debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 884674f..6c5b9ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,14 +38,20 @@ LDFLAGS += -Wl,--no-keep-memory
# Also add execution time and memory usage stats in the logs
LDFLAGS += -Wl,--stats
-# Build with gcc-4.9 on Stretch, Buster,Xenial, Yakkety, Zesty, and Horizon.
-distrelease := $(shell lsb_release -cs)
-ifeq ($(distrelease),$(filter $(distrelease),stretch buster xenial yakkety \
-zesty artful bionic Horizon))
+# Build with gcc-6 on Buster, Sid, Artful, Bionic and Cosmic.
+ifeq ($(DIST),$(filter $(DIST),buster sid artful bionic cosmic))
+export CC=gcc-6
+export CXX=g++-6
+export CPP=cpp-6
+export LD=gcc-6
+# Build with gcc-4.9 on Jessie, Xenial and Horizon.
+else ifeq ($(DIST),$(filter $(DIST),jessie xenial Horizon))
export CC=gcc-4.9
export CXX=g++-4.9
export CPP=cpp-4.9
export LD=gcc-4.9
+else
+# Use the system default.
endif
AUTOCONF_DIRS := build/autoconf js/src/build/autoconf
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
More information about the x2go-commits
mailing list