1*4882a593SmuzhiyunFrom 71f329d997d949d3c12d62d2f1473a1c99ee49b0 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Baruch Siach <baruch@tkos.co.il> 3*4882a593SmuzhiyunDate: Sun, 27 Aug 2017 21:30:37 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Fix build without Python 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDon't define HAVE_PYTHON35 when PYTHON_LIBS is empty. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunAlso, don't build Python dependent code when HAVE_PYTHON35 is not 9*4882a593Smuzhiyundefined. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunThis fixes build failures like: 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunMakefile:1616: recipe for target 'python-pkg/dist/lirc-0.10.0.tar.gz' failed 14*4882a593Smuzhiyunmake[3]: *** [python-pkg/dist/lirc-0.10.0.tar.gz] Error 1 15*4882a593Smuzhiyunpython-pkg/lirc/_client.c:1:20: fatal error: Python.h: No such file or directory 16*4882a593Smuzhiyun #include <Python.h> 17*4882a593Smuzhiyun ^ 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 20*4882a593Smuzhiyun--- 21*4882a593SmuzhiyunUpstream status: commit 74a2bcab6b 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun Makefile.am | 2 ++ 24*4882a593Smuzhiyun configure.ac | 3 ++- 25*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 1 deletion(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 28*4882a593Smuzhiyunindex 9f3dd14340cc..d8164fcd44cf 100644 29*4882a593Smuzhiyun--- a/Makefile.am 30*4882a593Smuzhiyun+++ b/Makefile.am 31*4882a593Smuzhiyun@@ -104,6 +104,7 @@ dist_py_pkg_doc_DATA = python-pkg/doc/Doxyfile \ 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun libpython = $(libdir)/python$(PYTHON_VERSION) 34*4882a593Smuzhiyun pydir = $(libpython)/site-packages/lirc 35*4882a593Smuzhiyun+if HAVE_PYTHON35 36*4882a593Smuzhiyun py_LTLIBRARIES = python-pkg/lib/_client.la 37*4882a593Smuzhiyun python_pkg_lib__client_la_SOURCES = \ 38*4882a593Smuzhiyun python-pkg/lirc/_client.c 39*4882a593Smuzhiyun@@ -116,6 +117,7 @@ python_pkg_lib__client_la_LDFLAGS = \ 40*4882a593Smuzhiyun $(PYTHON_LIBS) 41*4882a593Smuzhiyun python_pkg_lib__client_la_LIBADD = \ 42*4882a593Smuzhiyun lib/liblirc_client.la 43*4882a593Smuzhiyun+endif 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun pylint: .phony 46*4882a593Smuzhiyun $(MAKE) -C tools pylint 47*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 48*4882a593Smuzhiyunindex 4108688433f8..07d901deafdf 100644 49*4882a593Smuzhiyun--- a/configure.ac 50*4882a593Smuzhiyun+++ b/configure.ac 51*4882a593Smuzhiyun@@ -50,7 +50,8 @@ test -z "$PYTHON_LIBS" && \ 52*4882a593Smuzhiyun test -n "$PYTHON_LIBS" || \ 53*4882a593Smuzhiyun AC_MSG_WARN([No python package found (missing devel package?)]) 54*4882a593Smuzhiyun python_version_nodots=$(echo $PYTHON_VERSION | tr -d '.') 55*4882a593Smuzhiyun-AM_CONDITIONAL(HAVE_PYTHON35, [test $python_version_nodots -ge 35]) 56*4882a593Smuzhiyun+AM_CONDITIONAL(HAVE_PYTHON35, [test -n "$PYTHON_LIBS" && \ 57*4882a593Smuzhiyun+ test $python_version_nodots -ge 35]) 58*4882a593Smuzhiyun CFLAGS="$CFLAGS $PYTHON_CFLAGS" 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun-- 62*4882a593Smuzhiyun2.14.1 63*4882a593Smuzhiyun 64