From 9710018e412fab07b4f1fcc65c9b248aed752d27 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 9 Jun 2020 18:56:28 +0200 Subject: [PATCH] freeswitch: prevent libcheck use Currently we disable some sofia tests to prevent build failure. An issue was actually raised upstream ([1]) where this was discussed. This cleared up some doubts. For instance it was established that libcheck is used as a test framework, if the lib is detected. In OpenWrt libcheck is available, so it may be in staging during the freeswitch build. Upstream also mentioned that libcheck is not always compatible with freeswitch, which depends on the libcheck version. This commit prevents libcheck detection. This is nicer than explicitly disabling tests that fail. [1] https://github.com/signalwire/freeswitch/issues/681 Signed-off-by: Sebastian Kemper --- net/freeswitch/Makefile | 2 +- net/freeswitch/patches/400-disable-libcheck.patch | 11 +++++++++++ .../patches/400-disable-sofia-sip-tests.patch | 11 ----------- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 net/freeswitch/patches/400-disable-libcheck.patch delete mode 100644 net/freeswitch/patches/400-disable-sofia-sip-tests.patch diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index d2caf2d..14e4911 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch PKG_VERSION:=1.10.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Sebastian Kemper PKG_SOURCE:=freeswitch-$(PKG_VERSION).-release.tar.xz diff --git a/net/freeswitch/patches/400-disable-libcheck.patch b/net/freeswitch/patches/400-disable-libcheck.patch new file mode 100644 index 0000000..74bd873 --- /dev/null +++ b/net/freeswitch/patches/400-disable-libcheck.patch @@ -0,0 +1,11 @@ +--- a/libs/sofia-sip/configure.ac ++++ b/libs/sofia-sip/configure.ac +@@ -250,7 +250,7 @@ SAC_OPENSSL + SAC_TPORT + + dnl Check is used for testing +-PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no") ++PKG_CHECK_MODULES(CHECK, we_do_not_want_check >= 0.9.4, have_check="yes", have_check="no") + AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") + if test x"$have_check" = "xyes"; then + AC_DEFINE([HAVE_CHECK], 1, [Define to 1 if check library is available]) diff --git a/net/freeswitch/patches/400-disable-sofia-sip-tests.patch b/net/freeswitch/patches/400-disable-sofia-sip-tests.patch deleted file mode 100644 index 6e7891c..0000000 --- a/net/freeswitch/patches/400-disable-sofia-sip-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libs/sofia-sip/Makefile.am -+++ b/libs/sofia-sip/Makefile.am -@@ -7,7 +7,7 @@ - - AUTOMAKE_OPTIONS = foreign 1.7 - --SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) packages tests s2check utils -+SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) packages # tests s2check utils - DIST_SUBDIRS = s2check libsofia-sip-ua libsofia-sip-ua-glib utils packages \ - tests win32 open_c - -- 2.30.2