diff options
| author | Jiri Slachta | 2018-08-11 10:16:44 +0000 |
|---|---|---|
| committer | GitHub | 2018-08-11 10:16:44 +0000 |
| commit | 1f1a639abe5fc29c21e9398724f0a84b8585df0f (patch) | |
| tree | 99673670a13f5dce37446ebb68c17964d1697129 | |
| parent | ef0b6466f4ff214de3432242f430239c7e503eb9 (diff) | |
| parent | e45e405487a109ac0aca83bbd5be5af29e26716e (diff) | |
| download | telephony-1f1a639abe5fc29c21e9398724f0a84b8585df0f.tar.gz | |
Merge pull request #351 from micmac1/sccp-nls
asterisk-chan-sccp: remove iconv hack
| -rw-r--r-- | net/asterisk-chan-sccp/Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/net/asterisk-chan-sccp/Makefile b/net/asterisk-chan-sccp/Makefile index 38f82be..06ce1a1 100644 --- a/net/asterisk-chan-sccp/Makefile +++ b/net/asterisk-chan-sccp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chan-sccp PKG_VERSION:=v4.3.0-20180322 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 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) include $(INCLUDE_DIR)/package.mk - -# 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 -liconv -endif +# chan-sccp needs iconv +include $(INCLUDE_DIR)/nls.mk define Package/chan-sccp/Default SUBMENU:=Telephony @@ -45,8 +39,7 @@ define Package/chan-sccp/Default CATEGORY:=Network TITLE:=SCCP channel support URL:=https://github.com/chan-sccp/chan-sccp - DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl - PKG_BUILD_DEPENDS:=libiconv + DEPENDS:=$(ICONV_DEPENDS) +libltdl endef define Package/asterisk13-chan-sccp |