From 17ee8cc8dacdf030b58d639132c7955b86b286b1 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Sun, 5 Apr 2020 17:26:04 -0700 Subject: [PATCH] add missing packages --- .gitlab-ci.yml | 9 +++++++++ setup.py | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75269804..55a25192 100644 --- 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 b1b99eb0..246dd66b 100644 --- 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, -- 2.30.2