|
Marcin Dulak |
a466fc3 |
--- src/config/makefile.h.orig
|
|
Marcin Dulak |
a466fc3 |
+++ src/config/makefile.h
|
|
Marcin Dulak |
a466fc3 |
@@ -2630,12 +2630,12 @@ else
|
|
Marcin Dulak |
a466fc3 |
GOTPYTHON2 := $(shell command -v python2 2> /dev/null)
|
|
Marcin Dulak |
a466fc3 |
GOTPYTHON := $(shell command -v python 2> /dev/null)
|
|
Marcin Dulak |
a466fc3 |
ifdef GOTPYTHON3
|
|
Marcin Dulak |
a466fc3 |
- PYTHONVERSION=$(shell python3 -V 2>&1 |cut -c 8-10)
|
|
Marcin Dulak |
a466fc3 |
+ PYTHONVERSION=$(shell python3 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
|
|
Marcin Dulak |
a466fc3 |
else ifdef GOTPYTHON2
|
|
Marcin Dulak |
a466fc3 |
- PYTHONVERSION=$(shell python2 -V 2>&1 |cut -c 8-10)
|
|
Marcin Dulak |
a466fc3 |
+ PYTHONVERSION=$(shell python2 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
|
|
Marcin Dulak |
a466fc3 |
else ifdef GOTPYTHON
|
|
Marcin Dulak |
a466fc3 |
#last try at python2
|
|
Marcin Dulak |
a466fc3 |
- PYTHONVERSION=$(shell python -V 2>&1 |cut -c 8-10)
|
|
Marcin Dulak |
a466fc3 |
+ PYTHONVERSION=$(shell python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
|
|
Marcin Dulak |
a466fc3 |
else
|
|
Marcin Dulak |
a466fc3 |
errorpython3:
|
|
Marcin Dulak |
a466fc3 |
$(info )
|
|
Marcin Dulak |
a466fc3 |
--- src/python/task_python.c.orig
|
|
Marcin Dulak |
a466fc3 |
+++ src/python/task_python.c
|
|
Marcin Dulak |
a466fc3 |
@@ -3,7 +3,11 @@
|
|
Marcin Dulak |
a466fc3 |
#include "ga.h"
|
|
Marcin Dulak |
a466fc3 |
|
|
Marcin Dulak |
a466fc3 |
#include <import.h>
|
|
Marcin Dulak |
a466fc3 |
+#if ( PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 9)
|
|
Marcin Dulak |
a466fc3 |
+/* might require new headers and code */
|
|
Marcin Dulak |
a466fc3 |
+#else
|
|
Marcin Dulak |
a466fc3 |
#include <graminit.h>
|
|
Marcin Dulak |
a466fc3 |
+#endif
|
|
Marcin Dulak |
a466fc3 |
#include <pythonrun.h>
|
|
Marcin Dulak |
a466fc3 |
#include <stdlib.h>
|
|
Marcin Dulak |
a466fc3 |
#include "typesf2c.h"
|