diff options
| author | Ruben Undheim <ruben.undheim@gmail.com> | 2019-10-18 20:49:48 +0000 |
|---|---|---|
| committer | Ruben Undheim <ruben.undheim@gmail.com> | 2019-10-18 20:49:48 +0000 |
| commit | 04a5dab9ba74c132f364e8f8e78607e2afc160f0 (patch) | |
| tree | 2b290784f7c5610b974b2f1783f821bd50d08e45 | |
| parent | 4602d43d52157a55e649ed6edd05b8e45e45e308 (diff) | |
Set path to berkeley-abc instead of relative path to yosys-abc
| -rw-r--r-- | debian/patches/0014-Set-path-to-berkeley-abc-instead-of-relative-path-to.patch | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/0014-Set-path-to-berkeley-abc-instead-of-relative-path-to.patch b/debian/patches/0014-Set-path-to-berkeley-abc-instead-of-relative-path-to.patch new file mode 100644 index 00000000..89a5f71b --- /dev/null +++ b/debian/patches/0014-Set-path-to-berkeley-abc-instead-of-relative-path-to.patch @@ -0,0 +1,35 @@ +From: Ruben Undheim <ruben.undheim@gmail.com> +Date: Fri, 18 Oct 2019 20:49:35 +0000 +Subject: Set path to berkeley-abc instead of relative path to yosys-abc + +--- + tests/aiger/run-test.sh | 2 +- + tests/tools/autotest.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/aiger/run-test.sh b/tests/aiger/run-test.sh +index deaf48a..4fbffcd 100755 +--- a/tests/aiger/run-test.sh ++++ b/tests/aiger/run-test.sh +@@ -3,7 +3,7 @@ + set -e + + OPTIND=1 +-abcprog="../../yosys-abc" # default to built-in version of abc ++abcprog="berkeley-abc" # default to built-in version of abc + while getopts "A:" opt + do + case "$opt" in +diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh +index 4d34786..6bece9b 100755 +--- a/tests/tools/autotest.sh ++++ b/tests/tools/autotest.sh +@@ -23,7 +23,7 @@ warn_iverilog_git=false + # The tests are skipped if firrtl2verilog is the empty string (the default). + firrtl2verilog="" + xfirrtl="../xfirrtl" +-abcprog="$toolsdir/../../yosys-abc" ++abcprog="berkeley-abc" + + if [ ! -f $toolsdir/cmp_tbdata -o $toolsdir/cmp_tbdata.c -nt $toolsdir/cmp_tbdata ]; then + ( set -ex; ${CC:-gcc} -Wall -o $toolsdir/cmp_tbdata $toolsdir/cmp_tbdata.c; ) || exit 1 diff --git a/debian/patches/series b/debian/patches/series index 643b1cf4..2175b25d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ kfreebsd-support.patch 0011-Do-not-show-g-build-flags-in-Version-string.patch 0012-Skip-non-deterministic-test-causing-random-FTBFS-on-.patch 0013-Let-dpkg-buildpackage-handle-stripping-of-binaries.patch +0014-Set-path-to-berkeley-abc-instead-of-relative-path-to.patch |