Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #351 from micmac1/sccp-nls

Browse source 
asterisk-chan-sccp: remove iconv hack
This commit is contained in:
Jiri Slachta 2018-08-11 12:16:44 +02:00 committed by GitHub
commit 1f1a639abe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/asterisk-chan-sccp/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=chan-sccp PKG_NAME:=chan-sccp
PKG_VERSION:=v4.3.0-20180322 PKG_VERSION:=v4.3.0-20180322
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
@ -30,14 +30,8 @@ PKG_INSTALL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
# chan-sccp needs iconv
# musl and glibc include their own iconv, but uclibc does not include $(INCLUDE_DIR)/nls.mk
ifneq ($(CONFIG_USE_UCLIBC),)
TARGET_CPPFLAGS+= \
-I$(STAGING_DIR)/usr/lib/libiconv-full/include
TARGET_LDFLAGS+= \
-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
endif
define Package/chan-sccp/Default define Package/chan-sccp/Default
SUBMENU:=Telephony SUBMENU:=Telephony
@ -45,8 +39,7 @@ define Package/chan-sccp/Default
CATEGORY:=Network CATEGORY:=Network
TITLE:=SCCP channel support TITLE:=SCCP channel support
URL:=https://github.com/chan-sccp/chan-sccp URL:=https://github.com/chan-sccp/chan-sccp
DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl DEPENDS:=$(ICONV_DEPENDS) +libltdl
PKG_BUILD_DEPENDS:=libiconv
endef endef
define Package/asterisk13-chan-sccp define Package/asterisk13-chan-sccp