[asterisk-commits] Make product rules - pass all stage variants (repotools[master])

[SVN commits to the Asterisk project]

Matt Jordan has submitted this change and it was merged.

Change subject: Make product rules - pass all stage variants
......................................................................


Make product rules - pass all stage variants

This change puts the STAGE_VARIANTS in quotes
when passing to make_stage so it receives all
of them.

Change-Id: Ia97c42dcd86a17748103c316655bf2326be2f9fd
---
M build_tools/Makefile.product_rules
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Matt Jordan: Looks good to me, approved; Verified



diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index cada362..c53d7c5 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -8,7 +8,7 @@
     ECHO_PREFIX=@
     CMD_PREFIX=@
 else
-    ECHO_PREFIX=@\# 
+    ECHO_PREFIX=@\#
     CMD_PREFIX=
 endif
 
@@ -92,7 +92,7 @@
 
 $(MODULE_OBJS): CFLAGS+=-I$(ASTINCDIR) -I/usr/include -I -Iinclude -DAST_MODULE=\"$(MODULE_NAME)\" -DAST_MODULE_SELF_SYM=__internal_$(MODULE_NAME)_self
 
-.c.o:: 
+.c.o::
 	$(ECHO_PREFIX) echo "  [CC] $@"
 	$(CMD_PREFIX) $(CC) -c $< -o $@ $(PJPROJECT_INCLUDES) $(CFLAGS) $(FLAVOR_CFLAGS) $(DEBUG_OPT) $(WARN) $(MAKE_DEPS)
 
@@ -172,7 +172,7 @@
 	$(ECHO_PREFIX) echo " [STAGE] $@"
 	@if [ -z "$(REPO)" ] ; then echo -e "Missing REPO=<repository>.\nExample: make stage REPO=https://origsvn.digium.com/svn/sites/downloads.digium.com/staging/telephony\n\n" ; exit 1 ; fi
 	$(CMD_PREFIX)repotools/build_tools/make_stage --version=$(PRODUCT_VERSION) --arch=$(ARCH) --package-name=$(MODULE_NAME) \
-		--variants=$(STAGE_VARIANTS) --stage-subdir=$(STAGE_SUBDIR) --skip-checks=$(SKIP_CHECKS) --repo=$(REPO)
+		--variants="$(STAGE_VARIANTS)" --stage-subdir=$(STAGE_SUBDIR) --skip-checks=$(SKIP_CHECKS) --repo=$(REPO)
 
 stage_64: export ARCH=x86_64
 stage_64: export REPO:=$(REPO)
@@ -180,10 +180,10 @@
 	$(ECHO_PREFIX) echo " [STAGE] $<"
 	@if [ -z "$(REPO)" ] ; then echo -e "Missing REPO=<repository>.\nExample: make stage REPO=https://origsvn.digium.com/svn/sites/downloads.digium.com/staging/telephony\n\n" ; exit 1 ; fi
 	$(CMD_PREFIX)repotools/build_tools/make_stage --version=$(PRODUCT_VERSION) --arch=$(ARCH) --package-name=$(MODULE_NAME) \
-		--variants=$(STAGE_VARIANTS) --stage-subdir=$(STAGE_SUBDIR) --skip-checks=$(SKIP_CHECKS) --repo=$(REPO)
+		--variants="$(STAGE_VARIANTS)" --stage-subdir=$(STAGE_SUBDIR) --skip-checks=$(SKIP_CHECKS) --repo=$(REPO)
 
 stage: stage_32 stage_64
-	
+
 printit:
 	@echo ------------------
 	@echo ARCH=$(ARCH)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia97c42dcd86a17748103c316655bf2326be2f9fd
Gerrit-PatchSet: 2
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Scott Griepentrog <sgriepentrog at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>