diff options
| author | micmac1 | 2018-08-16 20:19:45 +0000 |
|---|---|---|
| committer | GitHub | 2018-08-16 20:19:45 +0000 |
| commit | 4d83344fee40c3b0799cad069a6316eccc31f0a0 (patch) | |
| tree | 8f495d039e7510fb1f1e4518b46558852f6da577 | |
| parent | 76851ef29d12ab04af9b1847990ff35d860c4f4f (diff) | |
| parent | 3466a118b5dbcda016453ab5b0f388345da7a76a (diff) | |
| download | telephony-4d83344fee40c3b0799cad069a6316eccc31f0a0.tar.gz | |
Merge pull request #365 from micmac1/fs-perl-master
freeswitch-stable: fix perl setup
| -rw-r--r-- | net/freeswitch-stable/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 09083df..f90e315 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -261,7 +261,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 | \ @@ -743,7 +745,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" \ |