Author: svn-role Date: Wed Apr 8 04:00:22 2020 New Revision: 1876261 URL: http://svn.apache.org/viewvc?rev=1876261&view=rev Log: Merge the r1875742 group from trunk:
* r1875742, r1875762 Fix autogen.sh SWIG python bindings generation in --release mode. Justification: We can no longer create usable release artifacts without this fix. Votes: +1: stsp, jamessan, cmpilato Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/build/generator/gen_make.py Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1875742,1875762 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876261&r1=1876260&r2=1876261&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Apr 8 04:00:22 2020 @@ -21,13 +21,6 @@ Veto-blocked changes: Approved changes: ================= - * r1875742, r1875762 - Fix autogen.sh SWIG python bindings generation in --release mode. - Justification: - We can no longer create usable release artifacts without this fix. - Votes: - +1: stsp, jamessan, cmpilato - * r1875918 rep-cache.db insert optimization Justification: Modified: subversion/branches/1.14.x/build/generator/gen_make.py URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_make.py?rev=1876261&r1=1876260&r2=1876261&view=diff ============================================================================== --- subversion/branches/1.14.x/build/generator/gen_make.py (original) +++ subversion/branches/1.14.x/build/generator/gen_make.py Wed Apr 8 04:00:22 2020 @@ -511,6 +511,7 @@ class Generator(gen_base.GeneratorBase): standalone.write('top_srcdir = .\n') standalone.write('top_builddir = .\n') standalone.write('SWIG = swig\n') + standalone.write('SWIG_PY_OPTS = -python -py3 -nofastunpack -modern\n') standalone.write('PYTHON = ' + sys.executable + '\n') standalone.write('\n') standalone.write(open("build-outputs.mk","r").read())