From: Christian Heimes <christian@cheimes.de>
Date: Fri, 7 Sep 2012 00:26:26 +0000 (+0200)
Subject: Fix for fcc629208842
X-Git-Tag: v3.3.1rc1~818^2^2~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e2514031afe4ee2d9ea619d09150ccd77e61f3c;p=python

Fix for fcc629208842
BSD's make doesn't support some of the features.
---

4e2514031afe4ee2d9ea619d09150ccd77e61f3c
diff --cc Makefile.pre.in
index aa091fb8fa,5cb6774130..cbc1f9e774
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -474,17 -432,20 +466,23 @@@ coverage
  $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
  	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
 -platform: $(BUILDPYTHON)
 -	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
 +platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
 +	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  
 +# Generate the sysconfig build-time data
 +$(SYSCONFIGDATA): $(BUILDPYTHON)
 +	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
  
  # Build the shared modules
+ # MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+ # -s, --silent or --quiet is always the first char.
 -sharedmods: $(BUILDPYTHON)
 +sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
+ 	@case "$$MAKEFLAGS" in \
+ 	    s*) quiet="-q";; \
+ 	    *) quiet="";; \
+ 	esac; \
  	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
 -		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
++		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS