From: Xiretza <xiretza@xiretza.xyz>
Date: Wed, 29 Jan 2020 18:05:23 +0000 (+0100)
Subject: Improve ABC repository management in Makefile
X-Git-Tag: working-ls180~759^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90404e1969443a1b8a767ab8f3dc311709c5fe9d;p=yosys.git

Improve ABC repository management in Makefile

`rev-parse --short` output may have a different abbreviated hash length than
ABCREV, so a simple string comparison always fails, even if the correct
commit is checked out. Pass both commits through rev-parse and then
compare the full hashes instead.

Add an `echo-abc-rev` target so that packaging scripts can set ABCPULL=0 and
handle all the git nastiness themselves.
---

diff --git a/Makefile b/Makefile
index f147a4f47..ed2b7a147 100644
--- a/Makefile
+++ b/Makefile
@@ -668,7 +668,8 @@ ifneq ($(ABCREV),default)
 	$(Q) if ( cd abc 2> /dev/null && ! git diff-index --quiet HEAD; ); then \
 		echo 'REEBE: NOP pbagnvaf ybpny zbqvsvpngvbaf! Frg NOPERI=qrsnhyg va Lbflf Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; false; \
 	fi
-	$(Q) if test "`cd abc 2> /dev/null && git rev-parse --short HEAD`" != "$(ABCREV)"; then \
+	# set a variable so the test fails if git fails to run - when comparing outputs directly, empty string would match empty string
+	$(Q) if ! { cd abc && rev="`git rev-parse $(ABCREV)`" && test "`git rev-parse HEAD`" == "$$rev"; }; then \
 		test $(ABCPULL) -ne 0 || { echo 'REEBE: NOP abg hc gb qngr naq NOPCHYY frg gb 0 va Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; exit 1; }; \
 		echo "Pulling ABC from $(ABCURL):"; set -x; \
 		test -d abc || git clone $(ABCURL) abc; \
@@ -925,6 +926,9 @@ echo-yosys-ver:
 echo-git-rev:
 	@echo "$(GIT_REV)"
 
+echo-abc-rev:
+	@echo "$(ABCREV)"
+
 -include libs/*/*.d
 -include frontends/*/*.d
 -include passes/*/*.d