summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Kemper <sebastian_ml@gmx.net>2018-08-16 22:15:37 +0200
committerSebastian Kemper <sebastian_ml@gmx.net>2018-08-16 22:16:00 +0200
commit3dd44baa413ade6778f6bd494070b9591a1151d2 (patch)
tree6abf5b330158d858ed16d98cf3e8080921942d53
parentb9d7b321d15a44c5abb9e5d43a4ec78abfd9031b (diff)
freeswitch-stable: fix perl setup
A recent commit in packages/lang/perl is causing a problem with the perlmod.mk include. Work around this by including perlver.mk instead and setting up PERL_CMD and PERL_SITELIB manually. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
-rw-r--r--net/freeswitch-stable/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 991f123..fb85bfb 100644
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -256,7 +256,9 @@ endif
FS_STABLE_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
include $(TOPDIR)/feeds/packages/lang/python/python-host.mk
-include $(FS_STABLE_PERL_FEED)/perlmod.mk
+include $(FS_STABLE_PERL_FEED)/perlver.mk
+
+PERL_SITELIB:=/usr/lib/perl$(PERL_MAJOR)/$(PERL_VERSION2)
FS_STABLE_PERL_LIBS:=$(shell grep "^libs=" \
$(FS_STABLE_PERL_FEED)/files/base.config | \
@@ -744,7 +746,7 @@ endif
ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-perl-esl)$(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),)
CONFIGURE_VARS+= \
- PERL="$(PERL_CMD)" \
+ PERL="$(STAGING_DIR_HOSTPKG)/usr/bin/perl$(PERL_VERSION)" \
PERL_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_GNU_SOURCE -I$(STAGING_DIR)$(PERL_SITELIB)/CORE" \
PERL_INC="-I$(STAGING_DIR)$(PERL_SITELIB)/CORE" \
PERL_LDFLAGS="-Wl,-rpath,$(PERL_SITELIB)/CORE -L$(STAGING_DIR)$(PERL_SITELIB)/CORE -lperl" \