diff options
| author | Jack Koenig | 2018-05-29 14:41:18 -0700 |
|---|---|---|
| committer | Jack Koenig | 2018-05-30 14:17:28 -0700 |
| commit | bc18d2d785079b76ac970373f667de1fc7e4a1e2 (patch) | |
| tree | 69848255a63cf39bdba9262911d63382ec8e3c4e /.fix_yosys_abc.patch | |
| parent | 430a8afb2cf42e9eef438c7ea38934113de0bbcf (diff) | |
Improve Travis configuration and revert Yosys version
* Switch Yosys back to 0.7 with patch for moved ABC repo
* Add 30 min timeout for LEC tests
* h/t https://stackoverflow.com/questions/43918874#44007537
* Move Travis building of Verilator and Yosys to prelude stage
* Don't use automatic Travis Scala tests, do it manually
Diffstat (limited to '.fix_yosys_abc.patch')
| -rw-r--r-- | .fix_yosys_abc.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/.fix_yosys_abc.patch b/.fix_yosys_abc.patch new file mode 100644 index 00000000..dac2fb18 --- /dev/null +++ b/.fix_yosys_abc.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile b/Makefile +index 0a61fe65..ef336faf 100644 +--- a/Makefile ++++ b/Makefile +@@ -82,10 +82,10 @@ OBJS = kernel/version_$(GIT_REV).o + # is just a symlink to your actual ABC working directory, as 'make mrproper' + # will remove the 'abc' directory and you do not want to accidentally + # delete your work on ABC.. +-ABCREV = eb6eca6807cc ++ABCREV = a2d59be + ABCPULL = 1 +-ABCURL ?= https://bitbucket.org/alanmi/abc +-ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ++ABCURL ?= https://github.com/berkeley-abc/abc ++ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 + + # set ABCEXTERNAL = <abc-command> to use an external ABC instance + # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set. +@@ -386,14 +386,14 @@ yosys-config: misc/yosys-config.in + abc/abc-$(ABCREV)$(EXE): + $(P) + ifneq ($(ABCREV),default) +- $(Q) if ( cd abc 2> /dev/null && hg identify; ) | grep -q +; then \ ++ $(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 && hg identify | cut -f1 -d' '`" != "$(ABCREV)"; then \ ++ $(Q) if test "`cd abc 2> /dev/null && git rev-parse --short HEAD`" != "$(ABCREV)"; 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 || hg clone $(ABCURL) abc; \ +- cd abc && $(MAKE) DEP= clean && hg pull && hg update -r $(ABCREV); \ ++ test -d abc || git clone $(ABCURL) abc; \ ++ cd abc && $(MAKE) DEP= clean && git fetch origin master && git checkout $(ABCREV); \ + fi + endif + $(Q) rm -f abc/abc-[0-9a-f]* |