summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Kemper <sebastian_ml@gmx.net>2023-05-19 01:00:12 +0200
committerSebastian Kemper <sebastian_ml@gmx.net>2023-05-19 01:00:12 +0200
commit8bd8f5e3e4a328fd407230f4b9e77487cf6f2aad (patch)
tree3f12a30476ea1ffcd2c9819d29ef9df964937cde
parentafad179aaec9c18ef50881955005903e8fb4f340 (diff)
freeswitch: fix compile against musl-1.2.4
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
-rw-r--r--net/freeswitch/Makefile4
-rw-r--r--net/freeswitch/patches/200-mod_verto-fix-copts.patch2
-rw-r--r--net/freeswitch/patches/210-esl-perl-fix-copts.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 5c542b5..f90522b 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=freeswitch
PKG_VERSION:=1.10.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz
@@ -657,7 +657,7 @@ endif
ifneq ($(CONFIG_PACKAGE_freeswitch-misc-perl-esl)$(CONFIG_PACKAGE_freeswitch-mod-perl),)
CONFIGURE_VARS+= \
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_CFLAGS="-D_LARGEFILE_SOURCE $(if $(CONFIG_USE_MUSL),-D_LARGEFILE64_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" \
PERL_LIBDIR="-L$(PERL_SITELIB)/CORE" \
diff --git a/net/freeswitch/patches/200-mod_verto-fix-copts.patch b/net/freeswitch/patches/200-mod_verto-fix-copts.patch
index 68587e1..44549ec 100644
--- a/net/freeswitch/patches/200-mod_verto-fix-copts.patch
+++ b/net/freeswitch/patches/200-mod_verto-fix-copts.patch
@@ -7,7 +7,7 @@
-MCAST_la_CFLAGS = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
-MCAST_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
+MCAST_la_CFLAGS = $(CC_CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
-+MCAST_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) -w $(PERL_INC)
++MCAST_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) $(PERL_CFLAGS) -w $(PERL_INC)
MCAST_la_CPPFLAGS = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
MCAST_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
diff --git a/net/freeswitch/patches/210-esl-perl-fix-copts.patch b/net/freeswitch/patches/210-esl-perl-fix-copts.patch
index d9f71d8..4b03ea3 100644
--- a/net/freeswitch/patches/210-esl-perl-fix-copts.patch
+++ b/net/freeswitch/patches/210-esl-perl-fix-copts.patch
@@ -7,7 +7,7 @@
-ESL_la_CFLAGS = $(CC_CFLAGS) $(CFLAGS) -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
-ESL_la_CXXFLAGS = -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
+ESL_la_CFLAGS = $(CC_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
-+ESL_la_CXXFLAGS = -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS) -w $(PERL_INC)
++ESL_la_CXXFLAGS = -I$(switch_srcdir)/libs/esl/src/include $(SWITCH_AM_CXXFLAGS) $(PERL_CFLAGS) -w $(PERL_INC)
ESL_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
ESL_la_LIBADD = ../libesl.la