add missing packages

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 752698049f801114a8a2fa297d71b6b6725797b9..55a251928cac5019010ec5704273f15ae7968542 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ build:
             python3-setuptools python3-wheel pkg-config tcl-dev
             libreadline-dev bison flex libffi-dev ccache python3-venv
             binutils-powerpc64-linux-gnu binutils-powerpc64le-linux-gnu
+            autoconf gperf libgmp-dev
         - export PATH="/usr/lib/ccache:$PATH"
         - export CCACHE_BASEDIR="$PWD"
         - export CCACHE_DIR="$PWD/ccache"
@@ -28,6 +29,14 @@ build:
         - . .env/bin/activate
         - pip install nose
 
+        - git clone --depth 1 https://github.com/SRI-CSL/yices2.git yices2
+        - pushd yices2
+        - autoconf
+        - ./configure
+        - make -j$(nproc)
+        - make install
+        - popd
+
         - git clone --depth 1 https://github.com/YosysHQ/yosys.git yosys
         - pushd yosys
         - make config-gcc

diff --git a/setup.py b/setup.py
index b1b99eb062802e16bb9aeff7f3ca9907762be36b..246dd66bcfc5162eeb83d43375d20fa713e3fd6a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 from setuptools import setup, find_packages
-import sys, os
+import sys
+import os
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.md')).read()
@@ -9,10 +10,11 @@ NEWS = open(os.path.join(here, 'NEWS.txt')).read()
 version = '0.0.1'
 
 install_requires = [
-#    'sfpy',
-    'ieee754fpu', # needs to be installed manually
+    #    'sfpy',
+    'ieee754fpu',  # needs to be installed manually
     'pygdbmi',
-    'ply', # needs to be installed manually
+    'ply',  # needs to be installed manually
+    'astor',
 ]
 
 test_requires = [
@@ -35,7 +37,7 @@ setup(
     url='http://git.libre-riscv.org/?p=soc',
     license='GPLv3+',
     packages=find_packages('src'),
-    package_dir = {'': 'src'},
+    package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     install_requires=install_requires,