[X2Go-Commits] [pale-moon] 03/11: debian/rules: add *FLAGS and DEB_ variable overrides/definitions from Debian's firefox(-esr) package.

git-admin at x2go.org git-admin at x2go.org
Mon May 28 23:44:15 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 aecd33dcb719d740820509f1ee7922526893b575
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 28 22:55:41 2018 +0200

    debian/rules: add *FLAGS and DEB_ variable overrides/definitions from Debian's firefox(-esr) package.
---
 debian/changelog |  2 ++
 debian/rules     | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 37af6b2..5323c87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ palemoon (27.9.1a1~0x2go1) obs; urgency=medium
   * debian/rules:
     - Tabbify.
     - Add dh_testdir protection. Debian's firefox(-esr) package uses it.
+    - Add *FLAGS and DEB_ variable overrides/definitions from Debian's
+      firefox(-esr) package.
 
  -- Mihai Moldovan <ionic at ionic.de>  Mon, 28 May 2018 03:44:10 +0200
 
diff --git a/debian/rules b/debian/rules
index 35aeeaa..4c4d846 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,18 @@
 
 TESTDIR = $(shell dh_testdir || echo no)
 ifeq (,$(TESTDIR))
+include debian/make.mk
+# Use dpkg-buildflags to get hardening flags, exclude non-hardening flags,
+# and disable read-only relocations.
+dpkg_buildflags = $(and $(1),$(shell DEB_BUILD_MAINT_OPTIONS=hardening=-relro DEB_CFLAGS_MAINT_STRIP="$(shell DEB_BUILD_MAINT_OPTIONS=hardening=-all dpkg-buildflags --get $(1))" dpkg-buildflags --get $(1)))
+$(call lazy,CFLAGS,$$(call dpkg_buildflags,CFLAGS))
+$(call lazy,CPPFLAGS,$$(call dpkg_buildflags,CPPFLAGS))
+$(call lazy,LDFLAGS,$$(call dpkg_buildflags,LDFLAGS))
+
+$(call lazy,DEB_HOST_GNU_TYPE,$$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
+$(call lazy,DEB_BUILD_GNU_TYPE,$$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE))
+$(call lazy,DEB_BUILD_ARCH,$$(shell dpkg-architecture -qDEB_BUILD_ARCH))
+$(call lazy,DEB_BUILD_ARCH_ENDIAN,$$(shell dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN))
 
 export SHELL=/bin/bash
 

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