summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:19:02 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:19:02 +0000
commit713d799995bfde089b81b8a8d22d55ea08ab8862 (patch)
treea39591498ca679c5aef288a2980785edbf59ffdd
parentMerging debian version 0.0~git20230821.ec4566b-1. (diff)
downloadwasi-libc-713d799995bfde089b81b8a8d22d55ea08ab8862.tar.xz
wasi-libc-713d799995bfde089b81b8a8d22d55ea08ab8862.zip
Building with llvm-toolchain-16 instead of llvm-toolchain-17.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/control2
-rw-r--r--debian/patches/llvm-17-compat.patch12
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules6
4 files changed, 4 insertions, 17 deletions
diff --git a/debian/control b/debian/control
index 38c1c2f..05a73e3 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-17, llvm-17
+Build-Depends: debhelper-compat (= 13), clang-16, llvm-16
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
deleted file mode 100644
index 5b4b117..0000000
--- a/debian/patches/llvm-17-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 fe4e4db..bedf490 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
dont-rebuild-install.patch
disable-warning.patch
-llvm-17-compat.patch
diff --git a/debian/rules b/debian/rules
index 2744c0b..4a62a41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,9 @@
include /usr/share/dpkg/buildflags.mk
-export NM = llvm-nm-17
-export AR = llvm-ar-17
-export CC = clang-17
+export NM = llvm-nm-16
+export AR = llvm-ar-16
+export CC = clang-16
# stack protector not yet supported, see
# https://github.com/CraneStation/wasi-libc/issues/157