[Reproducible-commits] [cdbs] 09/41: Fix allow early override of python autotools variable. Introduce new variables DEB_CONFIGURE_SCRIPT_ENV_PYTHON cdbs_make_curpythonruntime cdbs_autotools_configure_env.

[Mattia Rizzolo]

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

mattia pushed a commit to branch reproducible
in repository cdbs.

commit 596f548ed8b2f9d1300f0fa8ae63161761cfacdc
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Apr 20 10:33:09 2014 +0200

    Fix allow early override of python autotools variable. Introduce new variables DEB_CONFIGURE_SCRIPT_ENV_PYTHON cdbs_make_curpythonruntime cdbs_autotools_configure_env.
---
 1/class/autotools-vars.mk.in   | 6 +++++-
 1/class/python-autotools.mk.in | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/1/class/autotools-vars.mk.in b/1/class/autotools-vars.mk.in
index 361b9fc..7456afe 100644
--- a/1/class/autotools-vars.mk.in
+++ b/1/class/autotools-vars.mk.in
@@ -82,8 +82,12 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
 DEB_CONFIGURE_DEBUG_ARGS ?= --enable-debug
 endif
 
+# all environment settings for autotools configure execution
+# (potentially extended by other snippets)
+cdbs_autotools_configure_env = $(DEB_CONFIGURE_SCRIPT_ENV)
+
 DEB_CONFIGURE_INVOKE ?= cd $(cdbs_make_curbuilddir) && \
-	$(DEB_CONFIGURE_SCRIPT_ENV) \
+	$(cdbs_autotools_configure_env) \
 	$(DEB_CONFIGURE_SCRIPT) \
 	$(DEB_CONFIGURE_NORMAL_ARGS) \
 	$(DEB_CONFIGURE_DEBUG_ARGS)
diff --git a/1/class/python-autotools.mk.in b/1/class/python-autotools.mk.in
index 5bf4e08..d2497b1 100644
--- a/1/class/python-autotools.mk.in
+++ b/1/class/python-autotools.mk.in
@@ -40,10 +40,12 @@ CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools)
 CDBS_BUILD_DEPENDS_class_python-autotools_python ?= $(cdbs_python_builddeps)
 CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools_python)
 
-# FIXME: Restructure to allow early override
-DEB_CONFIGURE_SCRIPT_ENV += PYTHON="$(or $(strip \
+cdbs_make_curpythonruntime = $(or $(strip \
 	$(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%)),$(strip \
-	$(call cdbs_python_binary,python$(cdbs_make_curflavor))))"
+	$(call cdbs_python_binary,python$(cdbs_make_curflavor))))
+
+DEB_CONFIGURE_SCRIPT_ENV_PYTHON ?= PYTHON="$(cdbs_make_curpythonruntime)"
+cdbs_autotools_configure_env += $(DEB_CONFIGURE_SCRIPT_ENV_PYTHON)
 
 # Install all flavors on top of each other by default
 DEB_MAKE_DESTDIRSKEL = $(cdbs_curdestdir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/cdbs.git