changeset:   92195:edb6b282469e
branch:      2.7
parent:      92181:727fd4ead3fd
user:        Ned Deily <nad@acm.org>
date:        Fri Aug 22 13:30:59 2014 -0700
files:       Makefile.pre.in Misc/NEWS configure configure.ac
description:
Issue #21166: Prevent possible segfaults and other random failures of
python --generate-posix-vars in pybuilddir.txt build target by ensuring
that pybuilddir.txt is always regenerated when configure is run and
that the newly built skeleton python does not inadvertently import
modules from previously installed instances.


diff -r 727fd4ead3fd -r edb6b282469e Makefile.pre.in
--- a/Makefile.pre.in	Fri Aug 22 10:50:47 2014 -0400
+++ b/Makefile.pre.in	Fri Aug 22 13:30:59 2014 -0700
@@ -447,8 +447,18 @@
 # Create build directory and generate the sysconfig build-time data there.
 # pybuilddir.txt contains the name of the build dir and is used for
 # sys.path fixup -- see Modules/getpath.c.
+# Since this step runs before shared modules are built, try to avoid bootstrap
+# problems by creating a dummy pybuildstr.txt just to allow interpreter
+# initialization to succeed.  It will be overwritten by generate-posix-vars
+# or removed in case of failure.
 pybuilddir.txt: $(BUILDPYTHON)
-		$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
+	@echo "none" > ./pybuilddir.txt
+	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\
+	if test $$? -ne 0 ; then \
+		echo "generate-posix-vars failed" ; \
+		rm -f ./pybuilddir.txt ; \
+		exit 1 ; \
+	fi
 
 # Build the shared modules
 # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
diff -r 727fd4ead3fd -r edb6b282469e Misc/NEWS
--- a/Misc/NEWS	Fri Aug 22 10:50:47 2014 -0400
+++ b/Misc/NEWS	Fri Aug 22 13:30:59 2014 -0700
@@ -120,6 +120,9 @@
 - Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/
   now display special message when and only when there are failures.
 
+- Issue #21166: Prevent possible segfaults and other random failures of
+  python --generate-posix-vars in pybuilddir.txt build target.
+
 Windows
 -------
 
diff -r 727fd4ead3fd -r edb6b282469e configure
--- a/configure	Fri Aug 22 10:50:47 2014 -0400
+++ b/configure	Fri Aug 22 13:30:59 2014 -0700
@@ -2857,6 +2857,9 @@
 
 
 
+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
+rm -f pybuilddir.txt
+
 if test "$cross_compiling" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5
 $as_echo_n "checking for python interpreter for cross build... " >&6; }
diff -r 727fd4ead3fd -r edb6b282469e configure.ac
--- a/configure.ac	Fri Aug 22 10:50:47 2014 -0400
+++ b/configure.ac	Fri Aug 22 13:30:59 2014 -0700
@@ -16,6 +16,9 @@
 AC_SUBST(build)
 AC_SUBST(host)
 
+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
+rm -f pybuilddir.txt
+
 if test "$cross_compiling" = yes; then
     AC_MSG_CHECKING([for python interpreter for cross build])
     if test -z "$PYTHON_FOR_BUILD"; then