diff options
| author | Yann Herklotz <git@ymhg.org> | 2019-05-12 14:17:48 +0100 |
|---|---|---|
| committer | Yann Herklotz <git@ymhg.org> | 2019-05-12 14:17:58 +0100 |
| commit | 3c08b4c48abef4811ba73142de4969ef945c5450 (patch) | |
| tree | 697f18c46fcbe5f7271b6e686623d717135417ff | |
| parent | 48c2f0470fb51158d0474e1c5931f9e44d4945c2 (diff) | |
| download | verismith-3c08b4c48abef4811ba73142de4969ef945c5450.tar.gz verismith-3c08b4c48abef4811ba73142de4969ef945c5450.zip | |
Add more dependencies to build Yosys on EC2
| -rw-r--r-- | scripts/setup.sh | 11 | ||||
| -rw-r--r-- | test/Reduce.hs | 4 | ||||
| -rw-r--r-- | verifuzz.cabal | 5 |
3 files changed, 8 insertions, 12 deletions
diff --git a/scripts/setup.sh b/scripts/setup.sh index 4006f99..79d646c 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,19 +1,18 @@ #!/bin/sh sudo yum -y update -sudo yum -y install git gcc gcc-c++ tcl-devel python36 \ +sudo yum -y install git gcc72 gcc72-c++ tcl-devel python36 \ graphviz xdot gperf gmp-devel make bison flex autoconf \ - tmux + readline-devel clang6.0 tmux boost libffi-devel sudo mkdir -p /mnt/tools -sudo mount /dev/nvme2n1p1 /mnt/tools - -sudo chown -R $USER:$USER /mnt/tools/home/ec2-user curl -sSL https://get.haskellstack.org/ | sh { cat <<EOF -export PATH="\${PATH}:/mnt/tools/bin:/mnt/tools/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64/:/mnt/tools/opt/Xilinx/Vivado/2018.3/bin" +export PATH="\${PATH}:/mnt/tools/bin" +export PATH="\${PATH}:/mnt/tools/opt/Xilinx/14.7/ISE_DS/ISE/bin/lin64" +export PATH="\${PATH}:/mnt/tools/opt/Xilinx/Vivado/2018.3/bin" EOF } >> $HOME/.bashrc diff --git a/test/Reduce.hs b/test/Reduce.hs index 37a2604..cb90824 100644 --- a/test/Reduce.hs +++ b/test/Reduce.hs @@ -32,8 +32,8 @@ reduceUnitTests = testGroup "Reducer tests" activeWireTest :: TestTree activeWireTest = testCase "Active wires" $ do - findActiveWires verilog1 \\ ["x", "y", "z", "w"] @?= [] - findActiveWires verilog2 \\ ["x", "y", "z"] @?= [] + findActiveWires verilog1 \\ ["x", "y", "z", "w"] @?= [] + findActiveWires verilog2 \\ ["x", "y", "z"] @?= [] findActiveWires verilog3 \\ ["x", "y", "clk", "r1", "r2"] @?= [] where verilog1 = head $ getVerilog [verilog| diff --git a/verifuzz.cabal b/verifuzz.cabal index aaaac7e..70b42c8 100644 --- a/verifuzz.cabal +++ b/verifuzz.cabal @@ -89,6 +89,7 @@ library , gitrev >= 1.3.1 && <1.4 , deepseq >= 1.4.4.0 && <1.5 , template-haskell >=2.14.0 && <2.15 + , optparse-applicative >=0.14 && <0.15 default-extensions: OverloadedStrings executable verifuzz @@ -97,11 +98,7 @@ executable verifuzz default-language: Haskell2010 ghc-options: -threaded build-depends: base >= 4.7 && < 5 - , shelly >=1.8.0 && <1.9 , verifuzz - , text >=1.2 && <1.3 - , bytestring >=0.10 && <0.11 - , optparse-applicative >=0.14 && <0.15 default-extensions: OverloadedStrings test-suite test |