[Asterisk-code-review] Makefile.product_rules: Allow specifying OPENSSL_PATH and ZLIB_PATH (repotools[master])

[George Joseph]

George Joseph has submitted this change. ( https://gerrit.asterisk.org/c/repotools/+/15037 )

Change subject: Makefile.product_rules: Allow specifying OPENSSL_PATH and ZLIB_PATH
......................................................................

Makefile.product_rules: Allow specifying OPENSSL_PATH and ZLIB_PATH

...for libcp.  If set in the top product Makefile, those paths will
be used to build libcpo instead of the embedded versions.

Change-Id: I6ab1fdd837cc89ca216f776bc2363fcc4b21e38b
---
M build_tools/Makefile.product_rules
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index 15ed0a6..59cb9ec 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -113,8 +113,6 @@
 $(info $(help))
 endif
 
-.PRECIOUS: $(LIBS)
-
 .PHONY: all
 all:
 	@echo
@@ -129,7 +127,7 @@
 	if [ "x$$lastconfig" != "x$$currconfig" ] ; then\
 		echo " [MAKE PREREQ] $@ $(ARCH) with $(DEBUG_CFLAGS)";\
 		$(MAKE) INDENT="+   " --quiet --no-print-directory -C libcp clean;\
-		$(MAKE) INDENT="+   " --quiet --no-print-directory -j -C libcp ARCH=$(ARCH) OPT="$(CFLAGS)" DEBUG="$(DEBUG_CFLAGS)" libcp.a && \
+		$(MAKE) INDENT="+   " --quiet --no-print-directory -j -C libcp ZLIB_PATH=$(ZLIB_PATH) OPENSSL_PATH=$(OPENSSL_PATH) ARCH=$(ARCH) OPT="$(CFLAGS)" DEBUG="$(DEBUG_CFLAGS)" libcp.a && \
 		echo "$$currconfig" > last_$@~;\
 	else \
 		echo " [MAKE PREREQ] $@ $(ARCH) with $(DEBUG_CFLAGS) not needed";\

-- 
To view, visit https://gerrit.asterisk.org/c/repotools/+/15037
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Change-Id: I6ab1fdd837cc89ca216f776bc2363fcc4b21e38b
Gerrit-Change-Number: 15037
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20201001/f39621bc/attachment.html>