diff options
| author | Alessandro Gatti <a.gatti@frob.it> | 2024-09-19 20:27:04 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-09-23 11:47:18 +1000 |
| commit | bb3c711c04518bf926f85e05d29e8fbfc9dd1b93 (patch) | |
| tree | 8871adda75b2146eef23da29386e1d5b3b47204f /tools | |
| parent | 97966254577167f4c50200af1af89109a275da1c (diff) | |
tools/ci.sh: Let RV64 use a source-built version of libffi.
This commit lets the RV64 port use the version of libffi that is bundled
as a submodule in the MicroPython source tree, as the packaged libffi
library coming from Ubuntu's RISC-V repository trashes foreign function
call results on exit.
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/ci.sh b/tools/ci.sh index c25979d3b..4e860a791 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -421,6 +421,7 @@ CI_UNIX_OPTS_QEMU_ARM=( CI_UNIX_OPTS_QEMU_RISCV64=( CROSS_COMPILE=riscv64-linux-gnu- VARIANT=coverage + MICROPY_STANDALONE=1 ) function ci_unix_build_helper { @@ -691,16 +692,12 @@ function ci_unix_qemu_arm_run_tests { } function ci_unix_qemu_riscv64_setup { - . /etc/os-release - for repository in "${VERSION_CODENAME}" "${VERSION_CODENAME}-updates" "${VERSION_CODENAME}-security" - do - sudo add-apt-repository -y -n "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports ${repository} main" - done sudo apt-get update - sudo dpkg --add-architecture riscv64 - sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu libffi-dev:riscv64 + sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu sudo apt-get install qemu-user qemu-riscv64 --version + sudo mkdir /etc/qemu-binfmt + sudo ln -s /usr/riscv64-linux-gnu/ /etc/qemu-binfmt/riscv64 } function ci_unix_qemu_riscv64_build { |