projects
/
feed
/
telephony.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
asterisk-chan-dongle: sync up with master, fix endian issue
[feed/telephony.git]
/
net
/
asterisk-chan-dongle
/
Makefile
diff --git
a/net/asterisk-chan-dongle/Makefile
b/net/asterisk-chan-dongle/Makefile
index 822dbbf33ddbf0bb4a2efe41719821bda688183c..1e53e9eae55410dbea3a6556fc630ce0bd0a522b 100644
(file)
--- a/
net/asterisk-chan-dongle/Makefile
+++ b/
net/asterisk-chan-dongle/Makefile
@@
-8,13
+8,13
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk-chan-dongle
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk-chan-dongle
-PKG_VERSION:=1.1-20170
724
+PKG_VERSION:=1.1-20170
913
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=git://github.com/wdoekes/asterisk-chan-dongle.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=git://github.com/wdoekes/asterisk-chan-dongle.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=
1e452f7598266be0970cec582ba32dbc5568868d
+PKG_SOURCE_VERSION:=
4ef5ad7eea7245a031101875be08b924aa1e151b
PKG_SOURCE_PROTO:=git
PKG_FIXUP:=autoreconf
PKG_SOURCE_PROTO:=git
PKG_FIXUP:=autoreconf
@@
-31,8
+31,8
@@
define Package/asterisk-chan-dongle/Default
SUBMENU:=Telephony
SECTION:=net
CATEGORY:=Network
SUBMENU:=Telephony
SECTION:=net
CATEGORY:=Network
- URL:=https://
code.google.com/p
/asterisk-chan-dongle
- DEPENDS:=+kmod-usb-acm +kmod-usb-serial +kmod-usb-serial-option +libusb-1.0 +usb-modeswitch
+ 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
TITLE:=Huawei UMTS 3G dongle support
endef
TITLE:=Huawei UMTS 3G dongle support
endef
@@
-73,6
+73,12
@@
CONFIGURE_ARGS+= \
TARGET_CFLAGS+= \
-I$(CHAN_DONGLE_AST_HEADERS)
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:= \
# -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)" \
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 += \
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
ac_cv_type_size_t=yes \
ac_cv_type_ssize_t=yes