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

asterisk-chan-dongle: fix uclibc build

Browse source 
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>
This commit is contained in:
Sebastian Kemper 2017-09-02 00:28:16 +02:00
parent fa7b0c6cae
commit 0835ad378b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/asterisk-chan-dongle/Makefile
View file

@ -32,7 +32,7 @@ define Package/asterisk-chan-dongle/Default
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:=+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 TITLE:=Huawei UMTS 3G dongle support
endef endef
@ -73,6 +73,12 @@ CONFIGURE_ARGS+= \
TARGET_CFLAGS+= \ TARGET_CFLAGS+= \
-I$(CHAN_DONGLE_AST_HEADERS) -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 # -DAST_MODULE_SELF_SYM=__internal_chan_dongle_self to fix Asterisk 14
# compile issues # compile issues
CHAN_DONGLE_EXTRA_CFLAGS:= \ CHAN_DONGLE_EXTRA_CFLAGS:= \
@ -88,11 +94,11 @@ MAKE_ARGS:= \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) $(CHAN_DONGLE_EXTRA_CFLAGS)" \ 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 += \ 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_size_t=yes \
ac_cv_type_ssize_t=yes ac_cv_type_ssize_t=yes

2
net/asterisk-chan-dongle/patches/200-fix-iconv-detection.patch
View file

@ -5,7 +5,7 @@
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], "${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_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])