Add python3 option to swig

This commit is contained in:
Josef Ridky 2018-04-17 14:50:25 +02:00
parent 488f5d0be3
commit 90129e622b

View File

@ -90,7 +90,7 @@ diff -urNp a/configure.ac b/configure.ac
fi fi
diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am
--- a/swig/python/Makefile.am 2018-04-17 08:47:58.547283986 +0200 --- a/swig/python/Makefile.am 2018-04-17 08:47:58.547283986 +0200
+++ b/swig/python/Makefile.am 2018-04-17 13:08:09.752299116 +0200 +++ b/swig/python/Makefile.am 2018-04-17 14:43:01.703963727 +0200
@@ -22,19 +22,14 @@ EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h @@ -22,19 +22,14 @@ EXTRA_DIST = OpenIPMI_lang.i OpenIPMI.h
OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la OpenIPMI.pyc: OpenIPMI.py _OpenIPMI.la
-PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py' -PYTHONPATH=$(PYPATH) $(pythonprog) -c 'import OpenIPMI.py'
@ -99,7 +99,8 @@ diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am
- -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py'
- -
OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
$(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< - $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $<
+ $(SWIG) $(DEFS) -python -py3 -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $<
-CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc -CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
+CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py +CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py
@ -124,7 +125,7 @@ diff -urNp a/swig/python/Makefile.am b/swig/python/Makefile.am
rungui: rungui:
diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in
--- a/swig/python/Makefile.in 2018-04-17 08:47:58.547283986 +0200 --- a/swig/python/Makefile.in 2018-04-17 08:47:58.547283986 +0200
+++ b/swig/python/Makefile.in 2018-04-17 13:08:50.130269660 +0200 +++ b/swig/python/Makefile.in 2018-04-17 14:43:28.969899859 +0200
@@ -443,7 +443,7 @@ nodist__OpenIPMI_la_SOURCES = OpenIPMI_w @@ -443,7 +443,7 @@ nodist__OpenIPMI_la_SOURCES = OpenIPMI_w
_OpenIPMI_la_LDFLAGS = -module -avoid-version _OpenIPMI_la_LDFLAGS = -module -avoid-version
_OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) $(PYTHON_POSIX_LIB) _OpenIPMI_la_LIBADD = $(OPENIPMI_SWIG_LIBS) $(PYTHON_POSIX_LIB)
@ -145,7 +146,8 @@ diff -urNp a/swig/python/Makefile.in b/swig/python/Makefile.in
- -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py' - -PYTHONPATH=$(PYPATH) $(pythonprog) -O -c 'import OpenIPMI.py'
- -
OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i OpenIPMI_wrap.c OpenIPMI.py: $(top_srcdir)/swig/OpenIPMI.i OpenIPMI_lang.i
$(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $< - $(SWIG) $(DEFS) -python -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $<
+ $(SWIG) $(DEFS) -python -py3 -o OpenIPMI_wrap.c -I$(top_srcdir)/swig/python $<
-install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo -install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
+install-exec-local: _OpenIPMI.la OpenIPMI.py +install-exec-local: _OpenIPMI.la OpenIPMI.py