make install issue with "Update the copy of waf to current 1.5"

Jelmer Vernooij jelmer at samba.org
Sat May 9 04:03:14 MDT 2015


On Sat, May 02, 2015 at 10:51:38AM +0000, Jelmer Vernooij wrote:
> On Sat, May 02, 2015 at 09:36:47PM +1200, Andrew Bartlett wrote:
> > On Fri, 2015-05-01 at 14:37 +0000, Jelmer Vernooij wrote:
> > > On Fri, May 01, 2015 at 05:44:17PM +1200, Andrew Bartlett wrote:
> > > > Thanks Adrian,
> > > > 
> > > > Jelmer,
> > > > 
> > > > I've looked with Adrian at the delta between what we have in third-party
> > > > and the latest waf 1.5 release, and the differences are not what are
> > > > mentioned in the commit (that I reviewed!).  That is, I can't see
> > > > anything about LDVERSION or big changes in Python.py, but other files
> > > > seem to have odd differences. 
> > > The upstream change to add LDVERSION was reverted, meaning it is *not*
> > > included in this commit.
> > > 
> > > What odd differences are you seeing?
> > 
> > Jelmer,
> > 
> > None of the differences looked like LDVERSION. 
> Yes, that's expected. LDVERSION was added upstream (and wasn't present
> in Samba's copy of waf), and we chose to not include that change when
> we updated from upstream.
> 
> E.g. I ran:
> 
> * ran buildtools/bin/updatew-waf.sh
> * revert staged changes for Python.py

Andrew and I had a quick look at this together offline today. It looks
like this is a regression in upstream waf1.5 that was introduced by
6f106cb9f5c9d2ea933dda68481220c85c5495d6 in Dec 2014
(Issue 1514 - check_dir backport).

This is the current (non-whitespace) diff between upstream waf 1.5 and our copy:

diff --git a/third_party/waf/wafadmin/Tools/python.py b/third_party/waf/wafadmin/Tools/python.py
index cd96b65..a8a4aa0 100644
--- a/third_party/waf/wafadmin/Tools/python.py
+++ b/third_party/waf/wafadmin/Tools/python.py
@@ -195,19 +195,6 @@ LDVERSION = %r
 	python_LIBDIR, python_LIBPL, INCLUDEPY, Py_ENABLE_SHARED, python_MACOSX_DEPLOYMENT_TARGET,
 	python_LDVERSION))
 
-	# Allow some python overrides from env vars for cross-compiling
-	os_env = dict(os.environ)
-
-	override_python_LDFLAGS = os_env.get('python_LDFLAGS', None)
-	if override_python_LDFLAGS is not None:
-		conf.log.write("python_LDFLAGS override from environment = %r\n" % (override_python_LDFLAGS))
-		python_LDFLAGS = override_python_LDFLAGS
-
-	override_python_LIBDIR = os_env.get('python_LIBDIR', None)
-	if override_python_LIBDIR is not None:
-		conf.log.write("python_LIBDIR override from environment = %r\n" % (override_python_LIBDIR))
-		python_LIBDIR = override_python_LIBDIR
-
 	if python_MACOSX_DEPLOYMENT_TARGET:
 		conf.env['MACOSX_DEPLOYMENT_TARGET'] = python_MACOSX_DEPLOYMENT_TARGET
 		conf.environ['MACOSX_DEPLOYMENT_TARGET'] = python_MACOSX_DEPLOYMENT_TARGET

Cheers,

Jelmer


More information about the samba-technical mailing list