From fea8879c3ed83e07ba2ce756f6cba074d7c7545c Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 24 Feb 2018 11:22:36 +0100 Subject: [PATCH] siproxd: update libltdl handling Remove LIBLTDL from the Makefile as well as a patch related to LTDL. Both have in common that they accomplish absolutely nothing. Also explicitly disable the use of the internal libltdl. Signed-off-by: Sebastian Kemper --- net/siproxd/Makefile | 6 ++--- .../010-fix-bogus-libltdl-dependency.patch | 26 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index 5b9ad8f..a39b5fc 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -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. # See /LICENSE for more information. @@ -48,11 +48,11 @@ endef CONFIGURE_ARGS+= \ --with-libosip-prefix="$(STAGING_DIR)/usr" \ + --disable-ltdl-convenience \ --disable-doc MAKE_FLAGS+= \ - SUBDIRS="src scripts contrib" \ - LIBLTDL="$(STAGING_DIR)/usr/lib/libltdl.la" \ + SUBDIRS="src scripts contrib" define Package/siproxd/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch b/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch deleted file mode 100644 index d457eb4..0000000 --- a/net/siproxd/patches/010-fix-bogus-libltdl-dependency.patch +++ /dev/null @@ -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 \ -- 2.30.2