From efd4867be916e893d219b953c086706d2035d670 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 18 Dec 2017 13:29:00 +0000 Subject: [PATCH] swig.mk: Switch PHP support from PHP5 to PHP7 Signed-off-by: Jan Lindemann --- make/swig.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/make/swig.mk b/make/swig.mk index 03fd4df0..e0305e01 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -4,13 +4,15 @@ ifeq ($(SWIG_TARGET),php) SWIG_LANG ?= php SWIG_TARGET_EXT ?= php - SWIG_OPTS ?= -php5 - SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/php5 + PHP ?= php7 + #PHP ?= $(firstword $(notdir $(wildcard /usr/share/php*))) + SWIG_OPTS ?= -$(PHP) + SWIG_MODULE_TARGET_DIR = $(ENV_PREFIX)/usr/share/$(PHP) - SWIG_PHP_INCLUDE_DIR = /usr/include/php5 + SWIG_PHP_INCLUDE_DIR = /usr/include/$(PHP) SWIG_PHP_INCLUDE_SUBDIRS = . main TSRM Zend SWIG_PHP_MODULE_INI = $(SWIG_MODULE).ini - SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/php5/conf.d + SWIG_PHP_MODULE_INI_DIR = $(ENV_PREFIX)/etc/$(PHP)/conf.d #SWIG_PHP_NAMESPACE ?= $(SWIG_MODULE) SWIG_GENERATED_EXTRA += $(SWIG_PHP_MODULE_INI) @@ -21,7 +23,7 @@ ifeq ($(SWIG_TARGET),php) SWIG_CLEAN += php_$(SWIG_MODULE_H) $(SWIG_PHP_MODULE_INI) INCLUDE += $(addprefix -I$(SWIG_PHP_INCLUDE_DIR)/,$(SWIG_PHP_INCLUDE_SUBDIRS)) - INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/php5/extensions + INSTALL_LIBDIR = $(ENV_PREFIX)/usr/$(SYSTEM_LIBDIR_NAME)/$(PHP)/extensions LOCAL_CFLAGS += -Wno-unused-label -Wno-unused-function LOCAL_CPPFLAGS += -Wno-unused-label -Wno-unused-function