freeswitch-stable: add iconv support when using uclibc
authorSebastian Kemper <sebastian_ml@gmx.net>
Tue, 2 Jan 2018 10:16:44 +0000 (11:16 +0100)
committerSebastian Kemper <sebastian_ml@gmx.net>
Tue, 2 Jan 2018 10:18:56 +0000 (11:18 +0100)
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 <sebastian_ml@gmx.net>
net/freeswitch-stable/Makefile

index eaffe8d0460dd90745bbbc802ab971e08e767a81..b3308d3474273cfc1e43bef2092e14d195260ee7 100644 (file)
@@ -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 <sebastian_ml@gmx.net>
 
 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 \