diff options
| author | Sebastian Kemper | 2017-09-01 22:28:16 +0000 |
|---|---|---|
| committer | Sebastian Kemper | 2017-09-01 22:28:19 +0000 |
| commit | 0835ad378be725ca84998a5866a119023c48618a (patch) | |
| tree | 95d69f377a8a703e229bf1848ea097f2b675ef76 | |
| parent | fa7b0c6cae36b874d3aebb737e8144ea684f0e7b (diff) | |
| download | telephony-0835ad378be725ca84998a5866a119023c48618a.tar.gz | |
asterisk-chan-dongle: fix uclibc build
uclibc doesn't include iconv, so we need to use libiconv-full. This
fixes the ARC builds as they still default to uclibc.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
| -rw-r--r-- | net/asterisk-chan-dongle/Makefile | 14 | ||||
| -rw-r--r-- | net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/net/asterisk-chan-dongle/Makefile b/net/asterisk-chan-dongle/Makefile index 891d799..43ed2d3 100644 --- a/net/asterisk-chan-dongle/Makefile +++ b/net/asterisk-chan-dongle/Makefile @@ -32,7 +32,7 @@ define Package/asterisk-chan-dongle/Default SECTION:=net CATEGORY:=Network URL:=https://github.com/wdoekes/asterisk-chan-dongle - DEPENDS:=+kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +usb-modeswitch + DEPENDS:=+USE_UCLIBC:libiconv-full +kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +usb-modeswitch TITLE:=Huawei UMTS 3G dongle support endef @@ -73,6 +73,12 @@ CONFIGURE_ARGS+= \ TARGET_CFLAGS+= \ -I$(CHAN_DONGLE_AST_HEADERS) +# 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 +endif + # -DAST_MODULE_SELF_SYM=__internal_chan_dongle_self to fix Asterisk 14 # compile issues CHAN_DONGLE_EXTRA_CFLAGS:= \ @@ -88,11 +94,11 @@ MAKE_ARGS:= \ CC="$(TARGET_CC)" \ LD="$(TARGET_CC)" \ CFLAGS="$(TARGET_CFLAGS) $(CHAN_DONGLE_EXTRA_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" + LDFLAGS="$(TARGET_LDFLAGS) $(if $(CONFIG_USE_UCLIBC),-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv)" -# $TOOLCHAIN_DIR used by 200-fix-iconv-detection.patch +# $CHAN_DONGLE_ICONV_INC used by 200-fix-iconv-detection.patch CONFIGURE_VARS += \ - TOOLCHAIN_DIR=$(TOOLCHAIN_DIR) \ + CHAN_DONGLE_ICONV_INC="$(TOOLCHAIN_DIR)/include $(STAGING_DIR)/usr/lib/libiconv-full/include" \ ac_cv_type_size_t=yes \ ac_cv_type_ssize_t=yes diff --git a/net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch b/net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch index bc9d94d..211764f 100644 --- a/net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch +++ b/net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch @@ -5,7 +5,7 @@ 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], "${TOOLCHAIN_DIR}/include") ++AC_HEADER_FIND([iconv.h], ${CHAN_DONGLE_ICONV_INC}) AC_DEFINE([ICONV_CONST],[], [Define to const if you has iconv() const declaration of input buffer]) AC_MSG_CHECKING([for iconv use const inbuf]) |