[X2Go-Commits] [pale-moon] 21/216: debian/rules: add autoconf config.{guess, sub} replacement hack from Debian crossstream.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 16 02:42:43 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 5e8d4621f788304705287d7922eccbadb8cbcb04
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed May 30 23:28:36 2018 +0200

    debian/rules: add autoconf config.{guess,sub} replacement hack from Debian crossstream.
---
 debian/changelog |  2 ++
 debian/rules     | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ade80ac..090bd77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add further CC/CXX overrides (if set to the default value).
     - Move a CFLAGS override section down to the correct place.
     - Add line that actually exports stuff. Duh.
+    - Add autoconf config.{guess,sub} replacement hack from Debian
+      crossstream.
   * 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 4902a89..f73e23f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ export CPP=cpp-4.9
 export LD=gcc-4.9
 endif
 
+AUTOCONF_DIRS := build/autoconf js/src/build/autoconf
+
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS += --disable-optimize
 endif
@@ -78,6 +80,14 @@ CXXFLAGS = $(CFLAGS)
 EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 $(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))"))
 
+stamps/prepare-configure:: stamps/dummy
+	for dir in $(AUTOCONF_DIRS); do \
+		for file in config.guess config.sub; do \
+			sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' $$dir/$$file; \
+		done; \
+	done
+	chmod 755 configure js/src/configure
+
 %:
 	dh $@ --parallel
 

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