From 4209a36afe4c66365bdffc5f62d287e94cfc8edd Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" Date: Wed, 9 Feb 2022 02:03:30 +0300 Subject: [PATCH] asterisk: fix build on macos This commit adds a patch to fix /sbin/launchd detection on macos Signed-off-by: Sergey V. Lobanov --- ...tall-launchd-issue-on-cross-platfrom.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch diff --git a/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch b/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch new file mode 100644 index 0000000..98d2595 --- /dev/null +++ b/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch @@ -0,0 +1,55 @@ +From: https://issues.asterisk.org/jira/browse/ASTERISK-29905 + +From d27d75ad8058f6ed35197737b949bac57202dd54 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" +Date: Wed, 9 Feb 2022 01:29:46 +0300 +Subject: [PATCH] build: fix bininstall launchd issue on cross-platfrom build + +configure script detects /sbin/launchd, but the result of this +check is not used in Makefile (bininstall). Makefile also detects +/sbin/launchd file to decide if it is required to install +safe_asterisk. + +configure script correctly detects cross compile build and sets +PBX_LAUNCHD=0 + +In case of building asterisk on MacOS host for Linux target using +external toolchain (e.g. OpenWrt toolchain), bininstall does not +install safe_asterisk (due to /sbin/launchd detection in Makefile), +but it is required on target (Linux). + +This patch adds HAVE_SBIN_LAUNCHD=@PBX_LAUNCHD@ to makeopts.in to +use the result of /sbin/launchd detection from configure script in +Makefile. +Also this patch uses HAVE_SBIN_LAUNCHD in Makefile (bininstall) to +decide if it is required to install safe_asterisk. + +Signed-off-by: Sergey V. Lobanov +--- + Makefile | 6 +++--- + makeopts.in | 2 ++ + 2 files changed, 5 insertions(+), 3 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -589,9 +589,9 @@ bininstall: _all installdirs $(SUBDIRS_I + $(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/" + $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" + $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/" +- if [ ! -f /sbin/launchd ]; then \ +- ./build_tools/install_subst contrib/scripts/safe_asterisk "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk"; \ +- fi ++ifneq ($(HAVE_SBIN_LAUNCHD),1) ++ ./build_tools/install_subst contrib/scripts/safe_asterisk "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk"; ++endif + + ifneq ($(DISABLE_XMLDOC),yes) + $(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation" +--- a/makeopts.in ++++ b/makeopts.in +@@ -369,3 +369,5 @@ SNDFILE_LIB=@SNDFILE_LIB@ + + BEANSTALK_INCLUDE=@BEANSTALK_INCLUDE@ + BEANSTALK_LIB=@BEANSTALK_LIB@ ++ ++HAVE_SBIN_LAUNCHD=@PBX_LAUNCHD@ -- 2.30.2