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

Merge pull request #283 from micmac1/siproxd-updates

Browse source 
Siproxd updates
This commit is contained in:
Jiri Slachta 2018-03-13 08:40:38 +01:00 committed by GitHub
commit c24cc0c639
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/siproxd/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2014-2017 OpenWrt.org # Copyright (C) 2014-2018 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=siproxd PKG_NAME:=siproxd
PKG_VERSION:=0.8.2 PKG_VERSION:=0.8.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/siproxd PKG_SOURCE_URL:=@SF/siproxd
@ -48,11 +48,11 @@ endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-libosip-prefix="$(STAGING_DIR)/usr" \ --with-libosip-prefix="$(STAGING_DIR)/usr" \
--disable-ltdl-convenience \
--disable-doc --disable-doc
MAKE_FLAGS+= \ MAKE_FLAGS+= \
SUBDIRS="src scripts contrib" \ SUBDIRS="src scripts contrib"
LIBLTDL="$(STAGING_DIR)/usr/lib/libltdl.la" \
define Package/siproxd/install define Package/siproxd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
@ -72,7 +72,7 @@ define BuildPlugin
define Package/siproxd-mod-$(1)/install define Package/siproxd-mod-$(1)/install
$(INSTALL_DIR) $$(1)/usr/lib/siproxd $(INSTALL_DIR) $$(1)/usr/lib/siproxd
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/siproxd/plugin_$(1)*.so* $$(1)/usr/lib/siproxd $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/siproxd/plugin_$(1).so $$(1)/usr/lib/siproxd
endef endef
$$(eval $$(call BuildPackage,siproxd-mod-$(1))) $$(eval $$(call BuildPackage,siproxd-mod-$(1)))

26
net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch
View file

@ -1,26 +0,0 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,8 +103,8 @@
# else Cygwin goes beserk when building...)
#
sbin_PROGRAMS = siproxd
-siproxd_LDFLAGS=-export-dynamic
-siproxd_LDADD = $(LIBLTDL) $(DLOPENPLUGINS)
+siproxd_LDFLAGS=-export-dynamic -lltdl
+siproxd_LDADD = $(DLOPENPLUGINS)
siproxd_SOURCES = siproxd.c proxy.c register.c sock.c utils.c \
sip_utils.c sip_layer.c log.c readconf.c rtpproxy.c \
rtpproxy_relay.c accessctl.c route_processing.c \
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -377,8 +377,8 @@
#
plugin_fix_fbox_anoncall_la_SOURCES = plugin_fix_fbox_anoncall.c
plugin_fix_fbox_anoncall_la_LDFLAGS = -module -avoid-version -shrext '.so'
-siproxd_LDFLAGS = -export-dynamic
-siproxd_LDADD = $(LIBLTDL) $(DLOPENPLUGINS)
+siproxd_LDFLAGS = -export-dynamic -lltdl
+siproxd_LDADD = $(DLOPENPLUGINS)
siproxd_SOURCES = siproxd.c proxy.c register.c sock.c utils.c \
sip_utils.c sip_layer.c log.c readconf.c rtpproxy.c \
rtpproxy_relay.c accessctl.c route_processing.c \