diff options
| author | horchi <vdr@jwendel.de> | 2019-11-28 13:35:08 +0100 |
|---|---|---|
| committer | horchi <vdr@jwendel.de> | 2019-11-28 13:35:08 +0100 |
| commit | 8ff8ab951ef977f0de2809959592587664dd06a3 (patch) | |
| tree | bbeb29272e45c7216bc581fd85b1c5af863d2579 | |
| parent | e64767a31174f2ee3cda6480633559a1423a9fc0 (diff) | |
| download | vdr-epg-daemon-8ff8ab951ef977f0de2809959592587664dd06a3.tar.gz vdr-epg-daemon-8ff8ab951ef977f0de2809959592587664dd06a3.tar.bz2 | |
2019-11-28: version 1.1.147 (horchi)\n - added: Support of python 3.8 (by Alexander Grothe)\n\n1.1.147
| -rw-r--r-- | HISTORY.h | 7 | ||||
| -rw-r--r-- | Make.config | 16 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | lib/Makefile | 7 |
4 files changed, 25 insertions, 11 deletions
@@ -4,8 +4,8 @@ * ----------------------------------- */ -#define _VERSION "1.1.146" -#define VERSION_DATE "21.10.2018" +#define _VERSION "1.1.147" +#define VERSION_DATE "28.11.2019" #define DB_API 7 #ifdef GIT_REV @@ -18,6 +18,9 @@ * ------------------------------------ * +2019-11-28: version 1.1.147 (horchi) + - added: Support of python 3.8 (by Alexander Grothe) + 2018-10-21: version 1.1.146 (horchi) change: Fixed gentoo compile problem diff --git a/Make.config b/Make.config index 4e06fc7..db65ba0 100644 --- a/Make.config +++ b/Make.config @@ -24,6 +24,10 @@ UPSTARTDEST = $(DESTDIR)/etc/init INIT_SYSTEM = systemd INIT_AFTER = mysql.service +# set the python intepreter + +PYTHON ?= python + # ------------------ # don't touch below @@ -69,7 +73,17 @@ ifdef SYSD_NOTIFY endif ifdef USELIBXML - DEFINES += $(shell xml2-config --cflags) $(shell xslt-config --cflags) $(shell python-config --includes) + DEFINES += $(shell xml2-config --cflags) $(shell xslt-config --cflags) +endif + +ifdef USEPYTHON + DEFINES += $(shell $(PYTHON)-config --includes) + ifeq ($(shell $(PYTHON) -c 'from __future__ import print_function; import sys; sys.exit(0) if sys.version_info[:2] < (3,8) else print(1)'), 1) + BASELIBS += $(shell $(PYTHON)-config --libs --embed) + else + BASELIBS += $(shell $(PYTHON)-config --libs) + endif + CFLAGS += $(shell $(PYTHON)-config --includes) endif ifdef SYSD_NOTIFY @@ -10,8 +10,10 @@ TARGET = epgd HTTPTARGET = epghttpd HISTFILE = "HISTORY.h" -BASELIBS = -lrt -lz -larchive -ldl -lcrypto -luuid -BASELIBS += $(shell mysql_config --libs_r) $(shell python-config --libs) $(shell pkg-config --cflags --libs jansson) +BASELIBS += -lrt -lz -larchive -ldl -lcrypto -luuid +BASELIBS += $(shell mysql_config --libs_r) +BASELIBS += $(shell pkg-config --cflags --libs jansson) + HLIB = -L./lib -lhorchi DLIBS = $(HLIB) $(BASELIBS) -lcurl $(shell xml2-config --libs) $(shell xslt-config --libs) -lexslt diff --git a/lib/Makefile b/lib/Makefile index 8c713f3..c17589b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -26,7 +26,7 @@ ifdef USECURL LIBOBJS += curl.o endif -BASELIBS = -lrt -lz -luuid +BASELIBS += -lrt -lz -luuid BASELIBS += $(shell mysql_config --libs_r) ifdef USECURL @@ -38,7 +38,6 @@ ifdef USEEPGS endif ifdef USEPYTHON - BASELIBS += $(shell python-config --libs) LIBOBJS += python.o endif @@ -63,10 +62,6 @@ endif CFLAGS += $(shell mysql_config --include) DEFINES += $(USES) -ifdef USEPYTHON - CFLAGS += $(shell python-config --includes) -endif - all: lib $(TEST) $(DEMO) lib: $(LIBTARGET).a |