From 9e485e04df8bc145f5af8d24ba3ad26eae99aab0047b0b63a5f98e9cb436a6a8 Mon Sep 17 00:00:00 2001 From: William Brown Date: Tue, 26 Jul 2022 01:10:12 +0000 Subject: [PATCH] Accepting request 990984 from home:MSirringhaus:branches:devel:languages:rust Use same commit as used by Rust upstream, to make rustc produce usable wasm-files. OBS-URL: https://build.opensuse.org/request/show/990984 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/wasi-libc?expand=0&rev=2 --- _service | 2 +- ...obs_scm:wasi-libc-0.1.1649882024.05cd0af.obscpio | 3 --- ...obs_scm:wasi-libc-0.1.1652147647.9886d3d.obscpio | 3 +++ _service:obs_scm:wasi-libc.obsinfo | 6 +++--- wasi-libc-0.1.1649882024.05cd0af.obscpio | 3 --- wasi-libc-0.1.1649882024.05cd0af.tar.xz | 3 --- wasi-libc-0.1.1652147647.9886d3d.obscpio | 3 +++ wasi-libc-0.1.1652147647.9886d3d.tar.xz | 3 +++ wasi-libc.obsinfo | 4 ++++ wasi-libc.spec | 13 ++++++++++--- 10 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 _service:obs_scm:wasi-libc-0.1.1649882024.05cd0af.obscpio create mode 100644 _service:obs_scm:wasi-libc-0.1.1652147647.9886d3d.obscpio delete mode 100644 wasi-libc-0.1.1649882024.05cd0af.obscpio delete mode 100644 wasi-libc-0.1.1649882024.05cd0af.tar.xz create mode 100644 wasi-libc-0.1.1652147647.9886d3d.obscpio create mode 100644 wasi-libc-0.1.1652147647.9886d3d.tar.xz create mode 100644 wasi-libc.obsinfo diff --git a/_service b/_service index d6b0566..7b68e3d 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://github.com/WebAssembly/wasi-libc git 0.1 - main + 9886d3d6200fcc3726329966860fc058707406cd diff --git a/_service:obs_scm:wasi-libc-0.1.1649882024.05cd0af.obscpio b/_service:obs_scm:wasi-libc-0.1.1649882024.05cd0af.obscpio deleted file mode 100644 index da03abf..0000000 --- a/_service:obs_scm:wasi-libc-0.1.1649882024.05cd0af.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb501337d1e48e9ac12550479ada8e49edb370abf99da76cacdbbd06a13d0cf9 -size 5880845 diff --git a/_service:obs_scm:wasi-libc-0.1.1652147647.9886d3d.obscpio b/_service:obs_scm:wasi-libc-0.1.1652147647.9886d3d.obscpio new file mode 100644 index 0000000..553f4ca --- /dev/null +++ b/_service:obs_scm:wasi-libc-0.1.1652147647.9886d3d.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab97985e6320761b3c2001d7af00e4193fa8ae2cd3c450ac60aabde83e3c2f47 +size 5555725 diff --git a/_service:obs_scm:wasi-libc.obsinfo b/_service:obs_scm:wasi-libc.obsinfo index a2b7cf9..c28fbbe 100644 --- a/_service:obs_scm:wasi-libc.obsinfo +++ b/_service:obs_scm:wasi-libc.obsinfo @@ -1,4 +1,4 @@ name: wasi-libc -version: 0.1.1649882024.05cd0af -mtime: 1649882024 -commit: 05cd0af0af4b5a191117d47a182adff1d6546b87 +version: 0.1.1652147647.9886d3d +mtime: 1652147647 +commit: 9886d3d6200fcc3726329966860fc058707406cd diff --git a/wasi-libc-0.1.1649882024.05cd0af.obscpio b/wasi-libc-0.1.1649882024.05cd0af.obscpio deleted file mode 100644 index 3862f5a..0000000 --- a/wasi-libc-0.1.1649882024.05cd0af.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fbdcb828773e62894155c6656c629f6f0a1d85772a7441168dc32338aa98d8e -size 5880845 diff --git a/wasi-libc-0.1.1649882024.05cd0af.tar.xz b/wasi-libc-0.1.1649882024.05cd0af.tar.xz deleted file mode 100644 index f41deff..0000000 --- a/wasi-libc-0.1.1649882024.05cd0af.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc2653e05f020c6851237ddb77ec23850819253ae2c40239be2407538de458d0 -size 1086636 diff --git a/wasi-libc-0.1.1652147647.9886d3d.obscpio b/wasi-libc-0.1.1652147647.9886d3d.obscpio new file mode 100644 index 0000000..90e6fee --- /dev/null +++ b/wasi-libc-0.1.1652147647.9886d3d.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:711cc039b0f8f238a7fc2981c470369d1671c48e7b2bf14175f0c42074b09656 +size 5555725 diff --git a/wasi-libc-0.1.1652147647.9886d3d.tar.xz b/wasi-libc-0.1.1652147647.9886d3d.tar.xz new file mode 100644 index 0000000..8a2dae6 --- /dev/null +++ b/wasi-libc-0.1.1652147647.9886d3d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2213d324a38dd2e899e834e6263671b99912e50b61e651020e698da717098654 +size 931424 diff --git a/wasi-libc.obsinfo b/wasi-libc.obsinfo new file mode 100644 index 0000000..c28fbbe --- /dev/null +++ b/wasi-libc.obsinfo @@ -0,0 +1,4 @@ +name: wasi-libc +version: 0.1.1652147647.9886d3d +mtime: 1652147647 +commit: 9886d3d6200fcc3726329966860fc058707406cd diff --git a/wasi-libc.spec b/wasi-libc.spec index 09b679f..2147df0 100644 --- a/wasi-libc.spec +++ b/wasi-libc.spec @@ -17,7 +17,7 @@ Name: wasi-libc -Version: 0.1.1649882024.05cd0af +Version: 0.1.1652147647.9886d3d Release: 0 Summary: WASI libc implementation for WebAssembly # FIXME: Select a correct license from https://github.com/openSUSE/spec-cleaner#spdx-licenses @@ -26,8 +26,8 @@ URL: https://github.com/WebAssembly/wasi-libc Source: %{name}-%{version}.tar.xz Source1: wasi-libc-rpmlintrc Patch1: workaround-broken-makefile.patch -BuildRequires: clang > 8 -BuildRequires: llvm > 8 +BuildRequires: clang > 10 +BuildRequires: llvm > 10 %description @@ -37,13 +37,20 @@ BuildRequires: llvm > 8 %build export CC=clang +export AR=llvm-ar +export NM=llvm-nm %make_build %install export CC=clang +export AR=llvm-ar +export NM=llvm-nm # The makefile is stupid and compiles everything again if we do `make install`, so we # do it only once %make_install INSTALL_DIR="%{buildroot}/%{_datadir}/wasi-sysroot" +# brp-15-strip-debug and -ar call system-strip and ar, which are not wasm-aware, so they will break wasm-files +export NO_BRP_AR=true +export NO_BRP_STRIP_DEBUG=true %files %license LICENSE