build and install p2 snapshot target

and symlink the existing one under the 'p1' suffix as well, both needed to
build the corresponding targets in rustc.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/patches/llvm-17-compat.patch b/debian/patches/llvm-17-compat.patch
index f0322f738da16fc6c9ea64b8f028b77ad0d1ed41..253e00fd86998081ff5e6d4fdef9e90dfee6cc36 100644 (file)
--- a/debian/patches/llvm-17-compat.patch
+++ b/debian/patches/llvm-17-compat.patch
@@ -10,3 +10,15 @@ Index: wasi-libc/expected/wasm32-wasip1/undefined-symbols.txt
  __trunctfdf2
  __trunctfsf2
  __unordtf2
+Index: wasi-libc/expected/wasm32-wasip2/undefined-symbols.txt
+===================================================================
+--- wasi-libc.orig/expected/wasm32-wasip2/undefined-symbols.txt
++++ wasi-libc/expected/wasm32-wasip2/undefined-symbols.txt
+@@ -62,6 +62,7 @@ __lttf2
+ __netf2
+ __stack_pointer
+ __subtf3
++__tls_base
+ __trunctfdf2
+ __trunctfsf2
+ __unordtf2

diff --git a/debian/rules b/debian/rules
index 2744c0b21bc8fecd46de95a97da5622327ada42b..a64024ee1844a17a4946998e00e8b23476e8efda 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,8 @@ build:
 
 override_dh_auto_build:
        dh_auto_build -- finish
+       dh_auto_build -- WASI_SNAPSHOT=p2 finish
 
 override_dh_auto_install:
        dh_auto_install -- INSTALL_DIR=$(CURDIR)/debian/tmp/usr
+       dh_auto_install -- INSTALL_DIR=$(CURDIR)/debian/tmp/usr WASI_SNAPSHOT=p2

diff --git a/debian/wasi-libc.install b/debian/wasi-libc.install
index e84288c7910c72a9a13c0d18e982b8efc73a2bb8..8cb5c45f87883c331b2629a22a26e8108fd8df2b 100644 (file)
--- a/debian/wasi-libc.install
+++ b/debian/wasi-libc.install
@@ -1,3 +1,6 @@
 usr/share/wasm32-wasi
 usr/lib/wasm32-wasi
 usr/include/wasm32-wasi/* /usr/include/wasm32-wasi
+usr/share/wasm32-wasip2
+usr/lib/wasm32-wasip2
+usr/include/wasm32-wasip2/* /usr/include/wasm32-wasip2

diff --git a/debian/wasi-libc.links b/debian/wasi-libc.links
new file mode 100644 (file)
index 0000000..a04d3a6
--- /dev/null
+++ b/debian/wasi-libc.links
@@ -0,0 +1,3 @@
+/usr/share/wasm32-wasi /usr/share/wasm32-wasip1
+/usr/lib/wasm32-wasi /usr/lib/wasm32-wasip1
+/usr/include/wasm32-wasi /usr/include/wasm32-wasip1