[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1875742 - /subversion/trunk/build/generator/gen_make.py
From:       stsp () apache ! org
Date:       2020-03-26 23:24:54
Message-ID: 20200326232454.9917517B4A6 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: stsp
Date: Thu Mar 26 23:24:54 2020
New Revision: 1875742

URL: http://svn.apache.org/viewvc?rev=1875742&view=rev
Log:
Fix autogen.sh SWIG python bindings generation in --release mode.

This was accidentally broken in r1869354 (merge swig-py3 branch to trunk).

* build/generator/gen_make.py: When generating autogen-standlone.mk, set
  SWIG_PY_OPTS to "-python". Otherwise swig gets invoked without any
  language options and SWIGPYTHON ends up being undefined. Swig is then
  unable to parse subversion/bindings/swig/include/svn_containers.swg
  because that file relies on the macro definition "hash_argout_typemap"
  which only takes effect if SWIGPYTHON is defined by swig.

Modified:
    subversion/trunk/build/generator/gen_make.py

Modified: subversion/trunk/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1875742&r1=1875741&r2=1875742&view=diff
 ==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Thu Mar 26 23:24:54 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\n')
     standalone.write('PYTHON = ' + sys.executable + '\n')
     standalone.write('\n')
     standalone.write(open("build-outputs.mk","r").read())


[prev in list] [next in list] [prev in thread] [next in thread]