diff options
author | Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk> | 2018-11-09 10:21:08 +0000 |
---|---|---|
committer | Hesham Almatary <Hesham.Almatary@cl.cam.ac.uk> | 2019-11-12 10:44:51 +0000 |
commit | cd67edb7ca371c79b72223496393813457afd728 (patch) | |
tree | 8c5ecf67663050decf762ff3211ed3b65cc55ead /source-builder | |
parent | 9e71002175fadd04b6dbcc145dcf91967e7f4505 (diff) |
rsb: Update RISC-V's Spike revision
Latest Spike integrated fesvr in its source directory, so there
is no separate fesvr anymore.
Also use a revision of Spike that fixes the file permissions
when getting installed.
Diffstat (limited to 'source-builder')
-rw-r--r-- | source-builder/config/spike-1-1.cfg | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/source-builder/config/spike-1-1.cfg b/source-builder/config/spike-1-1.cfg index 7eb0080..760e1cc 100644 --- a/source-builder/config/spike-1-1.cfg +++ b/source-builder/config/spike-1-1.cfg @@ -18,7 +18,6 @@ URL: https://github.com/riscv/riscv-isa-sim/ # Source # %source set spike --rsb-file=spike-%{spike_version}.tar.gz https://github.com/riscv/riscv-isa-sim/archive/%{spike_version}.tar.gz -%source set fesvr --rsb-file=fesvr-%{fesvr_version}.tar.gz https://github.com/riscv/riscv-fesvr/archive/%{fesvr_version}.tar.gz # # Prepare the source code. @@ -26,33 +25,16 @@ URL: https://github.com/riscv/riscv-isa-sim/ %prep build_top=$(pwd) - source_dir_fesvr="riscv-fesvr-%{fesvr_version}" source_dir_spike="riscv-isa-sim-%{spike_version}" - %source setup fesvr -q -n riscv-fesvr-%{fesvr_version} %source setup spike -q -n riscv-isa-sim-%{spike_version} - %patch setup fesvr -p1 - %patch setup spike -p1 - cd ${build_top} %build build_top=$(pwd) - %{build_directory} - - %{host_build_flags} - - cd ${source_dir_fesvr} - - ./configure \ - --prefix=%{_prefix} - - %{__make} %{?_smp_mflags} all$ - %{__make} install - - cd ../${source_dir_spike} + cd ${source_dir_spike} ./configure \ --prefix=%{_prefix} \ @@ -67,7 +49,7 @@ URL: https://github.com/riscv/riscv-isa-sim/ rm -rf $SB_BUILD_ROOT - cd riscv-isa-sim-01252686902fa30665fbecfc1476d169ad1333d1 + cd ${source_dir_spike} %{__make} DESTDIR=$SB_BUILD_ROOT PREFIX=%{_prefix} install cd ${build_top} |