[Python-checkins] r79222 - in python/branches/release31-maint: Makefile.pre.in Misc/NEWS

Sun Mar 21 20:27:27 CET 2010

Author: antoine.pitrou
Date: Sun Mar 21 20:27:27 2010
New Revision: 79222
Log:
Merged revisions 79221 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r79221 | antoine.pitrou | 2010年03月21日 20:25:26 +0100 (dim., 21 mars 2010) | 11 lines
 
 Merged revisions 79218 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r79218 | antoine.pitrou | 2010年03月21日 20:19:41 +0100 (dim., 21 mars 2010) | 5 lines
 
 Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
 variable anymore. It also forwards the LDFLAGS settings to the linker
 when building a shared library.
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Makefile.pre.in
 python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Makefile.pre.in
==============================================================================

--- python/branches/release31-maint/Makefile.pre.in	(original)
+++ python/branches/release31-maint/Makefile.pre.in	Sun Mar 21 20:27:27 2010
@@ -59,7 +59,7 @@
 # Compiler options
 OPT=		@OPT@
 BASECFLAGS=	@BASECFLAGS@
-CFLAGS=		$(BASECFLAGS) $(OPT) $(EXTRA_CFLAGS)
+CFLAGS=		$(BASECFLAGS) @CFLAGS@ $(OPT) $(EXTRA_CFLAGS)
 # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
 # be able to build extension modules using the directories specified in the
 # environment variables
@@ -89,8 +89,8 @@
 datarootdir= @datarootdir@
 
 # Expanded directories
-BINDIR=		$(exec_prefix)/bin
-LIBDIR=		$(exec_prefix)/lib
+BINDIR=		@bindir@
+LIBDIR=		@libdir@
 MANDIR=		@mandir@
 INCLUDEDIR=	@includedir@
 CONFINCLUDEDIR=	$(exec_prefix)/include
@@ -417,8 +417,8 @@
 # Build the shared modules
 sharedmods: $(BUILDPYTHON)
 	@case $$MAKEFLAGS in \
-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
 	esac
 
 # Build static library
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Mar 21 20:27:27 2010
@@ -4,6 +4,19 @@
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 3.1.3?
+===========================
+
+*Release date: 20XX-XX-XX*
+
+Build
+-----
+
+- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
+ variable anymore. It also forwards the LDFLAGS settings to the linker
+ when building a shared library.
+
+
 What's New in Python 3.1.2?
 ===========================
 
