[X2Go-Commits] [pale-moon] 18/216: debian/rules: move a CFLAGS override section down to the correct place.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 16 02:42:42 CET 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit 24bb58e3c6ab1848a8aaaaae9985f8150e8871f3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed May 30 21:54:26 2018 +0200

    debian/rules: move a CFLAGS override section down to the correct place.
---
 debian/changelog |  1 +
 debian/rules     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71dd914..0cb49ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add symbol generations hack for debug-noopt builds. Needs further
       support for GENSYMBOLS_FLAGS.
     - Add further CC/CXX overrides (if set to the default value).
+    - Move a CFLAGS override section down to the correct place.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
 
diff --git a/debian/rules b/debian/rules
index d25eb82..27a5f99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,15 +38,6 @@ export CPP=cpp-4.9
 export LD=gcc-4.9
 endif
 
-ifneq (,$(findstring gcc,$(CC)))
-ifeq (,$(filter 4.% 5.%,$(shell $(CC) -dumpversion)))
-CFLAGS += -fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks
-ifneq (,$(filter armel armhf,$(DEB_BUILD_ARCH)))
-CFLAGS += -fno-schedule-insns
-endif
-endif
-endif
-
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS += --disable-optimize
 endif
@@ -73,6 +64,15 @@ ifeq (default,$(origin CXX))
 CXX := g++
 endif
 
+ifneq (,$(findstring gcc,$(CC)))
+ifeq (,$(filter 4.% 5.%,$(shell $(CC) -dumpversion)))
+CFLAGS += -fno-schedule-insns2 -fno-lifetime-dse -fno-delete-null-pointer-checks
+ifneq (,$(filter armel armhf,$(DEB_BUILD_ARCH)))
+CFLAGS += -fno-schedule-insns
+endif
+endif
+endif
+
 CXXFLAGS = $(CFLAGS)
 
 EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS

--
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