From: Rosen Penev Date: Sat, 6 Mar 2021 22:44:13 +0000 (-0800) Subject: treewide: remove uClibc++ support X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=13fd0a5ab92fdf2f7accf9c27f94d41e80d1651e;p=feed%2Ftelephony.git treewide: remove uClibc++ support This is in preparation for removing the whole thing from base. Signed-off-by: Rosen Penev --- diff --git a/libs/gsmlib/Makefile b/libs/gsmlib/Makefile index a67e4d1..53ae116 100644 --- a/libs/gsmlib/Makefile +++ b/libs/gsmlib/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gsmlib PKG_VERSION:=1.10-20140304 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/vbouchaud/gsmlib.git @@ -31,7 +31,6 @@ PKG_LICENSE:=LGPL-2.1+ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Sebastian Kemper -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME)/Default @@ -44,7 +43,7 @@ $(call Package/$(PKG_NAME)/Default) SECTION:=libs CATEGORY:=Libraries TITLE:=GSM mobile phone access lib - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp endef define Package/gsm-utils diff --git a/libs/libctb/Makefile b/libs/libctb/Makefile index e2cb6b2..e1d6c1a 100644 --- a/libs/libctb/Makefile +++ b/libs/libctb/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libctb PKG_VERSION:=0.16 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://iftools.com/download/ctb/$(PKG_VERSION) @@ -23,7 +23,6 @@ PKG_LICENSE:=LGPL PKG_LICENSE_FILES:=build/COPYING PKG_MAINTAINER:=Sebastian Kemper -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) @@ -32,7 +31,7 @@ define Package/$(PKG_NAME) CATEGORY:=Libraries TITLE:=Communications toolbox - ctb URL:=https://iftools.com/opensource/ctb.en.php - DEPENDS:=$(CXX_DEPENDS) + DEPENDS:=+libstdcpp endef define Package/$(PKG_NAME)/description diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index 507a96d..b4da0e0 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject PKG_VERSION:=2.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 # download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz" PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz @@ -29,7 +29,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CONFIG_DEPENDS:=CONFIG_SOFT_FLOAT -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/pjproject/Default @@ -37,7 +36,7 @@ define Package/pjproject/Default CATEGORY:=Libraries SUBMENU:=Telephony URL:=https://www.pjsip.org - DEPENDS:=$(CXX_DEPENDS) +libopenssl +libuuid +libpthread + DEPENDS:=+libstdcpp +libopenssl +libuuid +libpthread endef define Package/pjproject/install/lib diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 1cfaaa8..a9d0721 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk PKG_VERSION:=18.1.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases @@ -326,7 +326,6 @@ PKG_CONFIG_DEPENDS:= \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-util-%,$(subst _,-,$(UTILS_AVAILABLE))) \ CONFIG_ASTERISK_LOW_MEMORY -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk # Needed for res-config-mysql and func-iconv to find iconv @@ -448,7 +447,7 @@ define Package/$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) TITLE:=Complete open source PBX, v$(PKG_VERSION) MENU:=1 - DEPENDS:=$(CXX_DEPENDS) +jansson +libcap +libedit +libopenssl +libsqlite3 +libuuid +libxml2 +zlib + DEPENDS:=+libstdcpp +jansson +libcap +libedit +libopenssl +libsqlite3 +libuuid +libxml2 +zlib USERID:=asterisk=385:asterisk=385 endef diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index b21b034..620cbe7 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch PKG_VERSION:=1.10.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz @@ -230,7 +230,6 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_freeswitch-misc-perl-esl \ CONFIG_SOFT_FLOAT -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk # iconv support include $(INCLUDE_DIR)/nls.mk @@ -368,8 +367,8 @@ $(call Package/freeswitch/Default) MENU:=1 USERID:=freeswitch=372:freeswitch=372 DEPENDS:= \ - $(CXX_DEPENDS) \ $(ICONV_DEPENDS) \ + +libstdcpp \ +!BUSYBOX_DEFAULT_SU:shadow-utils \ +!BUSYBOX_DEFAULT_SU:shadow-su \ +@OPENSSL_WITH_DEPRECATED \ diff --git a/net/pcapsipdump/Makefile b/net/pcapsipdump/Makefile index 29bb2f8..8cc4d27 100644 --- a/net/pcapsipdump/Makefile +++ b/net/pcapsipdump/Makefile @@ -13,20 +13,19 @@ PKG_SOURCE_PROTO:=svn PKG_SOURCE_URL:=https://svn.code.sf.net/p/pcapsipdump/code/trunk PKG_SOURCE_VERSION:=151 PKG_SOURCE_DATE=2019-10-07 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MIRROR_HASH:=a029b29946f0492220fc9c60ef3e7f0a7a0c660f0047957eab6802ae6b9f9ed4 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=LICENSE -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/pcapsipdump SECTION:=net CATEGORY:=Network SUBMENU:=Telephony - DEPENDS:=$(CXX_DEPENDS) +USE_GLIBC:libbsd +libpcap + DEPENDS:=+libstdcpp +USE_GLIBC:libbsd +libpcap TITLE:=SIP sessions dumping tool URL:=http://sourceforge.net/projects/pcapsipdump/ endef diff --git a/net/sipp/Makefile b/net/sipp/Makefile index a2add58..a395bec 100644 --- a/net/sipp/Makefile +++ b/net/sipp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sipp PKG_VERSION:=3.6.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/SIPp/sipp/releases/download/v$(PKG_VERSION) @@ -18,7 +18,6 @@ PKG_HASH:=6a560e83aff982f331ddbcadfb3bd530c5896cd5b757dd6eb682133cc860ecb1 PKG_LICENSE:=GPL-2.0+ BSD-3-Clause Zlib PKG_LICENSE_FILES:=LICENSE.txt -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -28,7 +27,7 @@ define Package/sipp SECTION:=net CATEGORY:=Network SUBMENU:=Telephony - DEPENDS:=$(CXX_DEPENDS) +libncurses +libpcap +libpthread + DEPENDS:=+libstdcpp +libncurses +libpcap +libpthread TITLE:=test tool / traffic generator for the SIP protocol URL:=http://sipp.sourceforge.net/ endef diff --git a/net/yate/Makefile b/net/yate/Makefile index 6480bbb..91fc10f 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yate PKG_VERSION:=6.1.0-1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/ @@ -39,7 +39,6 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)-mod-zlibcompress \ CONFIG_SOFT_FLOAT -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk # Needed for yate-mod-mysqldb to find iconv include $(INCLUDE_DIR)/nls.mk @@ -53,7 +52,7 @@ endef define Package/$(PKG_NAME) $(call Package/yate/Default) - DEPENDS:=+libpthread $(CXX_DEPENDS) + DEPENDS:=+libpthread +libstdcpp TITLE:=Yet Another Telephony Engine MENU:=1 endef