From: Serhiy Storchaka Date: Thu, 29 Sep 2016 17:46:08 +0000 (+0300) Subject: Issue #28258: Fixed build with Estonian locale (python-config and distclean X-Git-Tag: v3.7.0a1~2357 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e8c939e3d8103cd4f236754764858cb23342ab3;p=thirdparty%2FPython%2Fcpython.git Issue #28258: Fixed build with Estonian locale (python-config and distclean targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. --- 2e8c939e3d8103cd4f236754764858cb23342ab3 diff --cc Makefile.pre.in index 18ba615c3f0a,094bdd042cc2..dac9d55fb4bf --- a/Makefile.pre.in +++ b/Makefile.pre.in @@@ -1343,15 -1343,15 +1343,15 @@@ libinstall: build_all $(srcdir)/Modules $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure + @ # Substitution happens here, as the completely-expanded BINDIR + @ # is not available in configure sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py - # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} + @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} - sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config + LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config - # On Darwin, always use the python version of the script, the shell - # version doesn't use the compiler customizations that are provided - # in python (_osx_support.py). - if test `uname -s` = Darwin; then \ + @ # On Darwin, always use the python version of the script, the shell + @ # version doesn't use the compiler customizations that are provided + @ # in python (_osx_support.py). + @if test `uname -s` = Darwin; then \ cp python-config.py python-config; \ fi diff --cc Misc/NEWS index 7e0f3d599596,e71a20df2b49..c733eba47326 --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -161,12 -155,11 +161,15 @@@ Window Build ----- + - Issue #28258: Fixed build with Estonian locale (python-config and distclean + targets in Makefile). Patch by Arfrever Frehtes Taifersar Arahesis. + - Issue #26661: setup.py now detects system libffi with multiarch wrapper. +- Issue #27979: A full copy of libffi is no longer bundled for use when + building _ctypes on non-OSX UNIX platforms. An installed copy of libffi is + now required when building _ctypes on such platforms. + - Issue #15819: Remove redundant include search directory option for building outside the source tree.