[Asterisk-code-review] BuildSystem: Do not warn when bash is not installed. (asterisk[master])

Joshua Colp asteriskteam at digium.com
Thu Feb 15 06:17:47 CST 2018


Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/8076 )

Change subject: BuildSystem: Do not warn when bash is not installed.
......................................................................

BuildSystem: Do not warn when bash is not installed.

ASTERISK-27631

Change-Id: Iefdf268b0b98c3e7d8089ba87cf78136ac1d785b
---
M Makefile
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit



diff --git a/Makefile b/Makefile
index f116e2d..0a3202a 100644
--- a/Makefile
+++ b/Makefile
@@ -604,7 +604,12 @@
 
 NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
 OLDMODS=$(filter-out $(NEWMODS) $(notdir $(DESTDIR)$(ASTMODDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTMODDIR)/*.so)))
-BADMODS=$(strip $(filter-out $(shell ./build_tools/list_valid_installed_externals),$(OLDMODS)))
+ifneq ($(BASH),:)
+	FILMODS=$(filter-out $(shell ./build_tools/list_valid_installed_externals),$(OLDMODS))
+else
+	FILMODS=$(OLDMODS)
+endif
+BADMODS=$(strip $(FILMODS))
 
 oldmodcheck:
 	@if [ -n "$(BADMODS)" ]; then \

-- 
To view, visit https://gerrit.asterisk.org/8076
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefdf268b0b98c3e7d8089ba87cf78136ac1d785b
Gerrit-Change-Number: 8076
Gerrit-PatchSet: 3
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180215/a89ecf64/attachment.html>


More information about the asterisk-code-review mailing list