From 5efc34c0ed99a579ec96c0dd79807dfdd7cc96ec Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 2 Jan 2018 11:16:44 +0100 Subject: [PATCH] freeswitch-stable: add iconv support when using uclibc uclibc doesn't include iconv. This commit adds a dependency to libiconv-full when building against uclibc. iconv can be used by the included apr and is a hard dependency of mod_gsmopen. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index eaffe8d..b3308d3 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2017 OpenWrt.org +# Copyright (C) 2017 - 2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PRG_NAME:=freeswitch PKG_NAME:=$(PRG_NAME)-stable PKG_VERSION:=1.6.19 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz @@ -272,6 +272,14 @@ FS_STABLE_PERL_LIBS:=$(shell grep "^libs=" \ FS_STABLE_PYTHON_SITE_DIR:=$(FS_STABLE_LIB_DIR)/python$(PYTHON_VERSION)/site-packages +# musl and glibc include their own iconv, but uclibc does not +ifneq ($(CONFIG_USE_UCLIBC),) +TARGET_CPPFLAGS+= \ + -I$(STAGING_DIR)/usr/lib/libiconv-full/include +TARGET_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/libiconv-full/lib +endif + define Download/files define Download/$(1) FILE:=$(2) @@ -332,6 +340,7 @@ $(call Package/$(PKG_NAME)/Default) +FS_STABLE_WITH_ODBC:unixodbc \ +FS_STABLE_WITH_PGSQL:libpq \ +FS_STABLE_WITH_PNG:libpng \ + +USE_UCLIBC:libiconv-full \ +libcurl \ +libedit \ +libopenssl \