blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: support python 3.8

Browse Source 
In python 3.8, in order to link to -lpython3.8, you need to use the
exported pkg-config interface 'python3-embed' (or 'python3-config --libs
--embed'), see https://bugs.python.org/issue36721 for details.
This commit is contained in:
Eli Schwartz 2019-11-10 10:40:43 -05:00 committed by Sébastien Helleu
parent 5c8ac69f73
commit 76c6f52e8c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindPython.cmake
View File

@ -33,5 +33,8 @@ include(FindPkgConfig)
if(ENABLE_PYTHON2) if(ENABLE_PYTHON2)
pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL) pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
else() else()
pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL) pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
if(NOT PYTHON_FOUND)
pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
endif()
endif() endif()

5
configure.ac
View File

@ -477,7 +477,10 @@ if test "x$enable_python" = "xyes" ; then
if test "x$enable_python2" = "xyes" ; then if test "x$enable_python2" = "xyes" ; then
PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no]) PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no])
else else
PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no]) PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no])
if test "x$PYTHON_FOUND" != "xyes"; then
PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
fi
fi fi
if test "x$PYTHON_FOUND" != "xyes" ; then if test "x$PYTHON_FOUND" != "xyes" ; then
AC_MSG_WARN([ AC_MSG_WARN([