From f5c33174fb287b39690a533871ce9956d5bd5813 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 13 Oct 2018 10:45:36 +0000 Subject: [PATCH] swig.mk: Try to fix CentOS 7 perl target Detect PERL_CORE_DIR /usr/lib64/perl5/CORE, as in CentOS 7. Still doesn't work, as compilation fails on the generated C++ code. Signed-off-by: Jan Lindemann --- make/swig.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/swig.mk b/make/swig.mk index fb27893a..8a51a879 100644 --- a/make/swig.mk +++ b/make/swig.mk @@ -80,8 +80,8 @@ else ifeq ($(SWIG_TARGET),perl) SWIG_TARGET_EXT ?= pm SWIG_OPTS ?= -perl PERL_VERSION ?= $(patsubst v%,%,$(shell perl -e 'print $$^V;')) - PERL_BASE_DIR ?= $(ENV_PREFIX)/usr/lib/perl5 - PERL_CORE_DIR ?= $(PERL_BASE_DIR)/$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE/ + PERL_BASE_DIR ?= $(ENV_PREFIX)$(firstword $(wildcard /usr/lib64/perl5 /usr/lib/perl5)) + PERL_CORE_DIR ?= $(firstword $(wildcard $(PERL_BASE_DIR)/$(PERL_VERSION)/$(ARCH)-linux-thread-multi/CORE/ $(PERL_BASE_DIR)/CORE)) PERL_VENDOR_DIR ?= $(PERL_BASE_DIR)/vendor_perl/$(PERL_VERSION)/$(ARCH)-linux-thread-multi INCLUDE += -I$(PERL_CORE_DIR) SWIG_CLEAN += $(wildcard *.$(SWIG_TARGET_EXT))