diff options
| author | Danny Rawlins <contact@romster.me> | 2022-04-10 12:25:50 +1000 |
|---|---|---|
| committer | Danny Rawlins <contact@romster.me> | 2022-04-10 12:25:50 +1000 |
| commit | 1f142d7f0eaad9fe7d662179a0da72f2c63cedc4 (patch) | |
| tree | 92d7cbeb6ca022afc8740ef5e19b68e5efc517ab /wasi-libc | |
| parent | 70d5fdf4ef3f2c69c47068dbdf4bd8efaa706d89 (diff) | |
| download | contrib-1f142d7f0eaad9fe7d662179a0da72f2c63cedc4.tar.gz contrib-1f142d7f0eaad9fe7d662179a0da72f2c63cedc4.tar.xz | |
wasi-libc: 0+222+ad5133 -> 232.3eb02a7
Diffstat (limited to 'wasi-libc')
| -rw-r--r-- | wasi-libc/.signature | 7 | ||||
| -rw-r--r-- | wasi-libc/Pkgfile | 9 | ||||
| -rw-r--r-- | wasi-libc/llvm-14.patch | 30 |
3 files changed, 40 insertions, 6 deletions
diff --git a/wasi-libc/.signature b/wasi-libc/.signature index 3ed5f41b4..4ef100ecf 100644 --- a/wasi-libc/.signature +++ b/wasi-libc/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yT5z3IhQOb6QCv7VDAiLgDfk1v8xD6KKex+wvJi7sxzsjn2U066wlZXx1PaRoET4PygckbI+mttZ4WvTNLPGwo= -SHA256 (Pkgfile) = e6fe397bcd4b1b869a1559ae0d8e22921638ca7353f00e97ffb20a78ed5f6834 +RWSagIOpLGJF3xmtMYsjBwA4MEBMYJZXSMuhwNg3ktRmUfWunSFf6ltRdzuNa2twqOTwf6onneRcOgssA0U7tS3iLlSEkNrvJAU= +SHA256 (Pkgfile) = d4e162ca88b9153044a6d5f2dafd17edc0770358c0700a604ad25a4558a2a96d SHA256 (.footprint) = c0628cc7294ebe05a3a7f4c43cffc9aa31ac513281cccbd92ba96f4f9c9ea87b -SHA256 (wasi-libc-0+222+ad5133.tar.gz) = 085ab45e0591041a8dc104978ad3ff72589072161a922011762d53bf07169ac2 +SHA256 (wasi-libc-232.3eb02a7.tar.gz) = 198ac245d9053d4fb62d8ffeffd34cbf7ecd3d7991fcefbbf2883e4ec6fcda64 +SHA256 (llvm-14.patch) = d058fc91994e3c2a7bde544e356a39acb132fdbc75c9dbfc3c7f245b89f379c8 diff --git a/wasi-libc/Pkgfile b/wasi-libc/Pkgfile index 2e49aae8d..fc82a78a3 100644 --- a/wasi-libc/Pkgfile +++ b/wasi-libc/Pkgfile @@ -4,14 +4,17 @@ # Depends on: clang name=wasi-libc -version=0+222+ad5133 -_commit=ad5133410f66b93a2381db5b542aad5e0964db96 +version=232.3eb02a7 +_commit=3eb02a798b3ec0048c39d2ab8b97a70575892a5a release=1 -source=(https://github.com/WebAssembly/wasi-libc/archive/$_commit/$name-$version.tar.gz) +source=(https://github.com/WebAssembly/wasi-libc/archive/$_commit/$name-$version.tar.gz + llvm-14.patch) build() { cd $name-$_commit + patch -p1 -i $SRC/llvm-14.patch + make \ WASM_CC=/usr/bin/clang \ WASM_AR=/usr/bin/llvm-ar \ diff --git a/wasi-libc/llvm-14.patch b/wasi-libc/llvm-14.patch new file mode 100644 index 000000000..769982268 --- /dev/null +++ b/wasi-libc/llvm-14.patch @@ -0,0 +1,30 @@ +From c06cecb74c8b7662305235aac10921e81efd602d Mon Sep 17 00:00:00 2001 +From: Mike Hommey <mh@glandium.org> +Date: Fri, 8 Apr 2022 10:38:53 +0900 +Subject: [PATCH] Adjust the Makefile for LLVM 14 + +Rebased by Danny Rawlins, crux at romster dot me + +diff -pruN wasi-libc-3eb02a798b3ec0048c39d2ab8b97a70575892a5a.orig/Makefile wasi-libc-3eb02a798b3ec0048c39d2ab8b97a70575892a5a/Makefile +--- wasi-libc-3eb02a798b3ec0048c39d2ab8b97a70575892a5a.orig/Makefile 2022-04-09 09:44:41.031980458 +0000 ++++ wasi-libc-3eb02a798b3ec0048c39d2ab8b97a70575892a5a/Makefile 2022-04-09 09:48:10.370241521 +0000 +@@ -530,6 +530,7 @@ check-symbols: startup_files libc + @# + @# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0. + @# TODO: Filter out __FLT16_* for now, as not all versions of clang have these. ++ @# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14. + $(WASM_CC) $(CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \ + -isystem $(SYSROOT_INC) \ + -std=gnu17 \ +@@ -548,8 +549,11 @@ check-symbols: startup_files libc + -U__GNUC_PATCHLEVEL__ \ + -U__VERSION__ \ + -U__FLOAT128__ \ ++ -U__NO_MATH_ERRNO__ \ ++ -U__BITINT_MAXWIDTH__ \ + | sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \ + | grep -v '^#define __FLT16_' \ ++ | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \ + > "$(SYSROOT_SHARE)/predefined-macros.txt" + + # Check that the computed metadata matches the expected metadata. |