building sfpy works

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f3d3ddbb39e5986ce12257170e1b46ebbae4ffe..3b60a8d0e512705b207d2ec4a132089000c922f7 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:
             apt-get -y install
             build-essential git python3-dev python3-pip
             python3-setuptools python3-wheel pkg-config tcl-dev
-            libreadline-dev bison flex libffi-dev ccache
+            libreadline-dev bison flex libffi-dev ccache python3-venv
         - export PATH="/usr/lib/ccache:$PATH"
         - export CCACHE_BASEDIR="$PWD"
         - export CCACHE_DIR="$PWD/ccache"
@@ -23,6 +23,9 @@ build:
         - export CCACHE_DIR="$PWD/ccache"
         - ccache --show-stats
     script:
+        - python3 -m venv .env
+        - . .env/bin/activate
+
         - IEEE754FPU_PATH="$(pwd)"
         - git clone --depth 1 --recursive https://github.com/billzorn/sfpy.git sfpy
         - pushd sfpy
@@ -30,13 +33,14 @@ build:
         - git apply "$IEEE754FPU_PATH"/berkeley-softfloat.patch
         - popd
         - pushd SoftPosit
+        - git apply ../softposit_sfpy_build.patch
         - git apply "$IEEE754FPU_PATH"/SoftPosit.patch
         - popd
-        - pip3 install --upgrade -r requirements.txt
+        - pip install --upgrade -r requirements.txt
         - make lib -j$(nproc)
         - make cython -j$(nproc)
         - make wheel -j$(nproc)
-        - pip3 install dist/sfpy*.whl
+        - pip install dist/sfpy*.whl
         - popd
 
         - git clone --depth 1 https://github.com/YosysHQ/yosys.git yosys
@@ -49,14 +53,14 @@ build:
 
         - git clone --depth 1 https://github.com/nmigen/nmigen.git nmigen
         - pushd nmigen
-        - python3 setup.py develop
+        - python setup.py develop
         - popd
 
         - git clone --depth 1 git://git.libre-riscv.org/nmutil.git nmutil
         - pushd nmutil
-        - python3 setup.py develop
+        - python setup.py develop
         - popd
 
-        - python3 setup.py develop
+        - python setup.py develop
 
-        - python3 setup.py test
+        - python setup.py test