From: Christian Heimes <christian@cheimes.de>
Date: Thu, 6 Sep 2012 22:56:56 +0000 (+0200)
Subject: Issue #15591 and Issue #11715: silence output of setup.py when make is run with ... 
X-Git-Tag: v3.3.1rc1~818^2^2~134^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74b65c8ebcc5df066b376aa68570f1d2b1548f97;p=thirdparty%2FPython%2Fcpython.git

Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.
---

74b65c8ebcc5df066b376aa68570f1d2b1548f97
diff --cc Makefile.pre.in
index 681286598d9e,41dabd4c4a99..aa091fb8faa8
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -466,23 -440,14 +474,17 @@@ 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
 -sharedmods: $(BUILDPYTHON)
 +sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
- 	if which getopt >/dev/null; then \
- 	  mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \
- 	else \
- 	  mflags=" $$MAKEFLAGS "; \
- 	fi; \
- 	case $$mflags in "* -s *") quiet=-q; 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