[X2Go-Commits] [pale-moon] 07/38: debian/rules: add/backport new stamps/configure-check-palemoon target.

git-admin at x2go.org git-admin at x2go.org
Sat Jun 30 06:14: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 cfc6bbada35e6d310e9b0e8107bed3fdd2518157
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jun 29 08:02:08 2018 +0200

    debian/rules: add/backport new stamps/configure-check-palemoon target.
---
 debian/changelog |  1 +
 debian/rules     | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cdb206c..413fb73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add clean rules for stamps and config.{guess,sub} files.
     - Add stamps/configure-palemoon target.
     - Backport LIB_DIR from Firefox 52 build.
+    - Add/backport new stamps/configure-check-palemoon target.
   * 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 bc07fa6..2907b85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,27 @@ stamps/prepare-configure:: stamps/dummy
 	done
 	chmod 755 configure js/src/configure
 
+stamps/configure-check-palemoon:: stamps/configure-palemoon
+# Ensure --{with,enable}-system options properly set expected variables
+# according to the definitions in the mozconfig file.
+	@awk -F' *# *| *$$' ' \
+	BEGIN { confs="$(foreach f,autoconf.mk emptyvars.mk,$(CURDIR)/build-palemoon/config/$(f))" } \
+	$$1 ~ /system/ { \
+		if (! $$2) { \
+			print FILENAME ": Missing variable for",$$1; \
+			error=1; \
+		} else { \
+			split($$2,var,"="); \
+			cmd = "grep -l " var[1] " " confs; \
+			cmd | getline dir; \
+			sub(/\/[^\/]*$$/, "", dir); \
+			cmd = "$(MAKE) -C " dir " --no-print-directory echo-variable-" var[1]; \
+			cmd | getline value; \
+			if (value != var[2]) { print $$1, "triggered", var[1] "=" value,"instead of",$$2; error=1 } \
+		} \
+	} \
+	END { if (error) { exit 1 }}' debian/palemoon.mozconfig
+
 stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig
 	$(if $(wildcard build-palemoon),,mkdir build-palemoon)
 	cd build-palemoon && \

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