Selaa lähdekoodia

Merge pull request #2282 from micmac1/py3-detect

app_python3: update Python3 detection mechanism
Daniel-Constantin Mierla 5 vuotta sitten
vanhempi
commit
35251dfbd1
1 muutettua tiedostoa jossa 5 lisäystä ja 7 poistoa
  1. 5 7
      src/modules/app_python3/Makefile

+ 5 - 7
src/modules/app_python3/Makefile

@@ -11,18 +11,16 @@ NAME=app_python3.so
 # but no testing has been done with that.
 # but no testing has been done with that.
 PYTHON3?=python3
 PYTHON3?=python3
 
 
-PYTHON3_VERSION=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('VERSION'))"}
-PYTHON3_LIBDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LIBDIR'))"}
-PYTHON3_LDFLAGS=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LINKFORSHARED'))"}
-PYTHON3_INCDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_python_inc())"}
-
-LIBS=${shell ${PYTHON3}-config --ldflags}
+LIBS=${shell \
+	tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed) || \
+	tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \
+	echo $$tmp_py3_libs}
 
 
 ifeq ($(OS), freebsd)
 ifeq ($(OS), freebsd)
 LIBS+=-pthread
 LIBS+=-pthread
 endif
 endif
 
 
-DEFS+=-I${PYTHON3_INCDIR}
+DEFS+=${shell ${PYTHON3}-config --includes}
 
 
 include ../../Makefile.modules
 include ../../Makefile.modules