From e62b9952d98035d3664538decc458a62fe07f6a2 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Wed, 6 Mar 2019 21:15:34 +0000
Subject: Reseting Python environment variables also when building Python

Until now, we were only resetting the Python environment variables in the
actual processing Makefiles, not in the Makefile that build Python and its
modules. They are now added there also.
---
 reproduce/src/make/dependencies-python.mk | 21 ++++++++++++++++++++-
 reproduce/src/make/initialize.mk          | 15 +++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'reproduce/src/make')

diff --git a/reproduce/src/make/dependencies-python.mk b/reproduce/src/make/dependencies-python.mk
index 1e4f611..4a348d0 100644
--- a/reproduce/src/make/dependencies-python.mk
+++ b/reproduce/src/make/dependencies-python.mk
@@ -76,6 +76,26 @@ export LDFLAGS           := $(rpath_command) -L$(ildir)
 
 
 
+# Python enviroment
+# -----------------
+#
+# The main Python environment variable is `PYTHONPATH'. However, so far we
+# have found several other Python-related environment variables on some
+# systems which might interfere. To be safe, we are removing all their
+# values.
+export PYTHONPATH             := $(installdir)/lib/python/site-packages
+export PYTHONPATH3            := $(PYTHONPATH)
+export _LMFILES_              :=
+export PYTHONPATH2            :=
+export LOADEDMODULES          :=
+export MPI_PYTHON_SITEARCH    :=
+export MPI_PYTHON2_SITEARCH   :=
+export MPI_PYTHON3_SITEARCH   :=
+
+
+
+
+
 # Tarballs
 # --------
 #
@@ -362,4 +382,3 @@ $(ipydir)/urllib3: $(tdir)/urllib3-$(urllib3-version).tar.gz \
 $(ipydir)/webencodings: $(tdir)/webencodings-$(webencodings-version).tar.gz \
                         $(ibdir)/python3
 	$(call pybuild, tar xf, $<, webencodings-$(webencodings-version))
-
diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk
index 638338b..47bf3c7 100644
--- a/reproduce/src/make/initialize.mk
+++ b/reproduce/src/make/initialize.mk
@@ -116,10 +116,17 @@ export LDFLAGS         := -L$(installdir)/lib
 export SHELL           := $(installdir)/bin/bash
 export CPPFLAGS        := -I$(installdir)/include
 
+
+
+
+
 # Python enviroment
-# So far we have found several other Python-related environment
-# variables which might interfere. So we are just removing all
-# of their values within the pipeline.
+# -----------------
+#
+# The main Python environment variable is `PYTHONPATH'. However, so far we
+# have found several other Python-related environment variables on some
+# systems which might interfere. To be safe, we are removing all their
+# values.
 export PYTHONPATH             := $(installdir)/lib/python/site-packages
 export PYTHONPATH3            := $(PYTHONPATH)
 export _LMFILES_              :=
@@ -426,7 +433,7 @@ $(mtexdir)/initialize.tex: | $(mtexdir)
         # TeX package versions
 	cat $(BDIR)/dependencies/texlive-versions.tex >> $@
 
-	# Python packages
+        # Python packages
 	$(call pvcheck, python3, $(python-version), Python, pythonversion)
 	echo "\newcommand{\\numpyversion}{$(numpy-version)}"     >> $@
 	echo "\newcommand{\\astropyversion}{$(astropy-version)}" >> $@
-- 
cgit v1.2.1