summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:12:44 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:12:44 +0000
commite0f278b8c8438ab5832a7336d778a8230b9b37c6 (patch)
treeab92f4994ea2a29dfaed7474062c189e57e3cde0
parentMerging upstream version 0.0~git20230821.ec4566b. (diff)
downloadwasi-libc-e0f278b8c8438ab5832a7336d778a8230b9b37c6.tar.xz
wasi-libc-e0f278b8c8438ab5832a7336d778a8230b9b37c6.zip
Merging debian version 0.0~git20230821.ec4566b-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rw-r--r--debian/patches/llvm-17-compat.patch12
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules6
5 files changed, 24 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 77fcdc9..06339dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wasi-libc (0.0~git20230821.ec4566b-1) experimental; urgency=medium
+
+ * new upstream version needed for rustc 1.73+
+ * switch to LLVM 17
+
+ -- Fabian Grünbichler <debian@fabian.gruenbichler.email> Mon, 27 May 2024 14:49:41 +0200
+
wasi-libc (0.0~git20230621.7018e24-2~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 05a73e3..38c1c2f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ XSBC-Original-Uploaders:
Ximin Luo <infinity0@debian.org>,
Fabian Grünbichler <debian@fabian.gruenbichler.email>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 13), clang-16, llvm-16
+Build-Depends: debhelper-compat (= 13), clang-17, llvm-17
Standards-Version: 4.6.2
Homepage: https://github.com/CraneStation/wasi-libc
Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/wasi-libc
diff --git a/debian/patches/llvm-17-compat.patch b/debian/patches/llvm-17-compat.patch
new file mode 100644
index 0000000..5b4b117
--- /dev/null
+++ b/debian/patches/llvm-17-compat.patch
@@ -0,0 +1,12 @@
+diff --git a/expected/wasm32-wasi/undefined-symbols.txt b/expected/wasm32-wasi/undefined-symbols.txt
+index 6d3b2b7..98ce67e 100644
+--- a/expected/wasm32-wasi/undefined-symbols.txt
++++ b/expected/wasm32-wasi/undefined-symbols.txt
+@@ -63,6 +63,7 @@ __main_argc_argv
+ __netf2
+ __stack_pointer
+ __subtf3
++__tls_base
+ __trunctfdf2
+ __trunctfsf2
+ __unordtf2
diff --git a/debian/patches/series b/debian/patches/series
index bedf490..fe4e4db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
dont-rebuild-install.patch
disable-warning.patch
+llvm-17-compat.patch
diff --git a/debian/rules b/debian/rules
index 4a62a41..2744c0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,9 @@
include /usr/share/dpkg/buildflags.mk
-export NM = llvm-nm-16
-export AR = llvm-ar-16
-export CC = clang-16
+export NM = llvm-nm-17
+export AR = llvm-ar-17
+export CC = clang-17
# stack protector not yet supported, see
# https://github.com/CraneStation/wasi-libc/issues/157