From f645157a4bee7988793f3516ecce0b151ab9dbca Mon Sep 17 00:00:00 2001 From: "Sergey V. Lobanov" <sergey@lobanov.in> Date: Sat, 19 Feb 2022 00:59:02 +0300 Subject: [PATCH] build: fix bininstall launchd issue on cross-platform 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. ASTERISK-29905 #close Change-Id: Iff61217276cd188f43f51ef4cdbffe39d9f07f65 --- Makefile | 6 +++--- makeopts.in | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2c8fb97e88..fb06f714d3 100644 --- a/Makefile +++ b/Makefile @@ -561,9 +561,9 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall $(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" diff --git a/makeopts.in b/makeopts.in index 54eaa04a63..e99cd502a6 100644 --- a/makeopts.in +++ b/makeopts.in @@ -350,3 +350,5 @@ SNDFILE_LIB=@SNDFILE_LIB@ BEANSTALK_INCLUDE=@BEANSTALK_INCLUDE@ BEANSTALK_LIB=@BEANSTALK_LIB@ + +HAVE_SBIN_LAUNCHD=@PBX_LAUNCHD@ -- GitLab