Verified Commit 34d9e212 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 40802: Update the wasi-sdk and remove the patch to make it reproducible. 

We already uplifted the patch, and the new version includes it.
parent 30db5fad

projects/wasi-config/config

+1 −1
Changes for projects/wasi-config/config: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

git_url: https://git.savannah.gnu.org/git/config.git

git_hash: c179db1b6f2ae484bfca1e9f8bae273e3319fa7d

git_hash: f992bcc08219edb283d2ab31dd3871a4a0e8220e

filename: '[% project %]-[% c("version") %].tar.gz'

projects/wasi-libc/config

+1 −1
Changes for projects/wasi-libc/config: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

git_url: https://github.com/WebAssembly/wasi-libc.git

git_hash: 9886d3d6200fcc3726329966860fc058707406cd

git_hash: 1dfe5c302d1c5ab621f7abf04620fae92700fd22

filename: '[% c("project") %]-[% c("version") %].tar.gz'

projects/wasi-sysroot/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch

deleted100644 → 0
+0 −36
Changes for projects/wasi-sysroot/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch: 0 added lines, 36 removed lines.
Original line number Diff line number Diff line 
From ef21e4f17e104a34e7db89215db567cddd48832d Mon Sep 17 00:00:00 2001

From: Pier Angelo Vendrame <pierov@torproject.org>

Date: Wed, 1 Mar 2023 10:19:50 +0100

Subject: [PATCH] Sort the object list passed to ar in the Makefile.



This makes builds reproducible.

---

 Makefile | 10 +++++-----

 1 file changed, 5 insertions(+), 5 deletions(-)



diff --git a/Makefile b/Makefile

index c31e3d7..f350ecb 100644

--- a/Makefile

+++ b/Makefile

@@ -488,13 +488,13 @@ $(SYSROOT_LIB)/libwasi-emulated-signal.a: $(LIBWASI_EMULATED_SIGNAL_OBJS) $(LIBW

 %.a:

 	@mkdir -p "$(@D)"

 	# On Windows, the commandline for the ar invocation got too long, so it needs to be split up.

-	$(AR) crs $@ $(wordlist 1, 199, $^)

-	$(AR) crs $@ $(wordlist 200, 399, $^)

-	$(AR) crs $@ $(wordlist 400, 599, $^)

-	$(AR) crs $@ $(wordlist 600, 799, $^)

+	$(AR) crs $@ $(wordlist 1, 199, $(sort $^))

+	$(AR) crs $@ $(wordlist 200, 399, $(sort $^))

+	$(AR) crs $@ $(wordlist 400, 599, $(sort $^))

+	$(AR) crs $@ $(wordlist 600, 799, $(sort $^))

 	# This might eventually overflow again, but at least it'll do so in a loud way instead of

 	# silently dropping the tail.

-	$(AR) crs $@ $(wordlist 800, 100000, $^)

+	$(AR) crs $@ $(wordlist 800, 100000, $(sort $^))

 

 $(MUSL_PRINTSCAN_OBJS): CFLAGS += \

 	    -D__wasilibc_printscan_no_long_double \

-- 

2.39.2

projects/wasi-sysroot/build

+0 −3
Changes for projects/wasi-sysroot/build: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ mv clang-source llvm-project 
export LLVM_HOME=$(pwd)/llvm-project

tar -xf $rootdir/[% c('input_files_by_name/wasi-libc') %]

mv wasi-libc-* wasi-libc

pushd wasi-libc

patch -p1 < "$rootdir/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch"

popd

popd



# What follows has been copied from Firefox's

projects/wasi-sysroot/config

+1 −2
Changes for projects/wasi-sysroot/config: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ version: '[% c("abbrev") %]' 
# Mozilla and re-use the LLVM we already build.

# So, be sure to update also wasi-libc and wasi-config when you update this

# git hash!

git_hash: 37ae6af88201884c8b98a65adcd6d8cd1284f95e

git_hash: 935fe1acd2fcd7ea4aed2d5ee4527482862b6344

git_url: https://github.com/WebAssembly/wasi-sdk.git

git_submodule: 0
@@ -33,4 +33,3 @@ input_files: 
    project: wasi-config

  - name: wasi-libc

    project: wasi-libc
 
  - filename: '0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch'