Merge pull request #352 from micmac1/dongle-nls
asterisk-chan-dongle: remove iconv hack + update snapshot
This commit is contained in:
commit
ef0b6466f4
2 changed files with 18 additions and 12 deletions
|
@ -8,14 +8,14 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=asterisk-chan-dongle
|
PKG_NAME:=asterisk-chan-dongle
|
||||||
PKG_VERSION:=1.1-20180312
|
PKG_VERSION:=1.1-20180619
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/wdoekes/asterisk-chan-dongle.git
|
PKG_SOURCE_URL:=https://github.com/wdoekes/asterisk-chan-dongle.git
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE_VERSION:=3e2b3ca6fd4d0a996404dfdc724973e92f2683eb
|
PKG_SOURCE_VERSION:=fd544d628d134cfe9cc2df6b5315298e93698664
|
||||||
PKG_MIRROR_HASH:=655d1b6a78fb92f5a41410747d2ad633493e5eb2c5a2a0fdf8057dde4011213e
|
PKG_MIRROR_HASH:=f6074feff5931024e5ac9504ffc872c58b650352e29343969327c5205228fc2f
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
|
|
||||||
PKG_FIXUP:=autoreconf
|
PKG_FIXUP:=autoreconf
|
||||||
|
@ -29,13 +29,15 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
|
||||||
MODULES_DIR:=/usr/lib/asterisk/modules
|
MODULES_DIR:=/usr/lib/asterisk/modules
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
# asterisk-chan-dongle needs iconv
|
||||||
|
include $(INCLUDE_DIR)/nls.mk
|
||||||
|
|
||||||
define Package/asterisk-chan-dongle/Default
|
define Package/asterisk-chan-dongle/Default
|
||||||
SUBMENU:=Telephony
|
SUBMENU:=Telephony
|
||||||
SECTION:=net
|
SECTION:=net
|
||||||
CATEGORY:=Network
|
CATEGORY:=Network
|
||||||
URL:=https://github.com/wdoekes/asterisk-chan-dongle
|
URL:=https://github.com/wdoekes/asterisk-chan-dongle
|
||||||
DEPENDS:=+USE_UCLIBC:libiconv-full +kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +usb-modeswitch
|
DEPENDS:=$(ICONV_DEPENDS) +kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +usb-modeswitch
|
||||||
TITLE:=Huawei UMTS 3G dongle support
|
TITLE:=Huawei UMTS 3G dongle support
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -78,13 +80,7 @@ TARGET_CFLAGS+= \
|
||||||
|
|
||||||
MAKE_FLAGS+=LD="$(TARGET_CC)"
|
MAKE_FLAGS+=LD="$(TARGET_CC)"
|
||||||
|
|
||||||
# musl and glibc include their own iconv, but uclibc does not
|
|
||||||
TARGET_CPPFLAGS+=$(if $(CONFIG_USE_UCLIBC),-I$(STAGING_DIR)/usr/lib/libiconv-full/include)
|
|
||||||
TARGET_LDFLAGS+=$(if $(CONFIG_USE_UCLIBC),-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv)
|
|
||||||
|
|
||||||
# $CHAN_DONGLE_ICONV_INC used by 200-fix-iconv-detection.patch
|
|
||||||
CONFIGURE_VARS += \
|
CONFIGURE_VARS += \
|
||||||
CHAN_DONGLE_ICONV_INC="$(TOOLCHAIN_DIR)/include $(STAGING_DIR)/usr/lib/libiconv-full/include" \
|
|
||||||
DESTDIR="$(MODULES_DIR)" \
|
DESTDIR="$(MODULES_DIR)" \
|
||||||
ac_cv_type_size_t=yes \
|
ac_cv_type_size_t=yes \
|
||||||
ac_cv_type_ssize_t=yes
|
ac_cv_type_ssize_t=yes
|
||||||
|
|
|
@ -1,11 +1,21 @@
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -102,7 +102,7 @@ AC_DEFUN([AC_HEADER_FIND], [
|
@@ -77,7 +77,8 @@ fi
|
||||||
|
dnl Checks for libraries.
|
||||||
|
dnl AC_CHECK_LIB([pthread], [pthread_create])
|
||||||
|
dnl AC_CHECK_LIB([iconv], [iconv])
|
||||||
|
-AC_SEARCH_LIBS([iconv], [c iconv])
|
||||||
|
+dnl AC_SEARCH_LIBS([iconv], [c iconv])
|
||||||
|
+AC_CHECK_LIB([iconv], [libiconv])
|
||||||
|
|
||||||
|
dnl Checks for header files.
|
||||||
|
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h termios.h])
|
||||||
|
@@ -102,7 +103,7 @@ AC_DEFUN([AC_HEADER_FIND], [
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_HEADER_FIND([asterisk.h], $with_asterisk)
|
AC_HEADER_FIND([asterisk.h], $with_asterisk)
|
||||||
-AC_HEADER_FIND([iconv.h], /usr/include /usr/local/include /opt/local/include)
|
-AC_HEADER_FIND([iconv.h], /usr/include /usr/local/include /opt/local/include)
|
||||||
+AC_HEADER_FIND([iconv.h], ${CHAN_DONGLE_ICONV_INC})
|
+dnl AC_HEADER_FIND([iconv.h], /usr/include /usr/local/include /opt/local/include)
|
||||||
|
|
||||||
AC_DEFINE([ICONV_CONST],[], [Define to const if you has iconv() const declaration of input buffer])
|
AC_DEFINE([ICONV_CONST],[], [Define to const if you has iconv() const declaration of input buffer])
|
||||||
AC_MSG_CHECKING([for iconv use const inbuf])
|
AC_MSG_CHECKING([for iconv use const inbuf])
|
||||||
|
|
Loading…
Reference in a new issue