From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 28 Aug 2012 17:00:01 +0000 (+0200)
Subject: - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.
X-Git-Tag: v3.3.1rc1~818^2^2~178
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d652bacf47a5548b7cc38d7664c6571d36f7c68;p=python

- Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.
---

2d652bacf47a5548b7cc38d7664c6571d36f7c68
diff --cc Makefile.pre.in
index f715711d9e,62db9c1374..9f5e2a14ef
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@@ -466,18 -430,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
 -sharedmods: $(BUILDPYTHON)
 +sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
- 	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+         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)' \
 -		./$(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