Refresh patches

diff --git a/debian/patches/debian-flags.patch b/debian/patches/debian-flags.patch
index b56a1e375dec4255787b0c5a9c0b6c6c91b59be2..3c8ef0b380627b123bbfd532c46ee458eacef21c 100644 (file)
--- a/debian/patches/debian-flags.patch
+++ b/debian/patches/debian-flags.patch
@@ -1,8 +1,25 @@
-Index: wasi-libc/expected/wasm32-wasi/predefined-macros.txt
-===================================================================
---- wasi-libc.orig/expected/wasm32-wasi/predefined-macros.txt
-+++ wasi-libc/expected/wasm32-wasi/predefined-macros.txt
-@@ -1120,7 +1120,6 @@
+--- a/expected/wasm32-wasi/posix/predefined-macros.txt
++++ b/expected/wasm32-wasi/posix/predefined-macros.txt
+@@ -1119,7 +1119,6 @@
+ #define NAN (0.0f/0.0f)
+ #define NBBY 8
+ #define NCARGS 131072
+-#define NDEBUG 1
+ #define ND_NA_FLAG_OVERRIDE 0x00000020
+ #define ND_NA_FLAG_ROUTER 0x00000080
+ #define ND_NA_FLAG_SOLICITED 0x00000040
+@@ -3113,7 +3112,7 @@
+ #define and_eq &=
+ #define asin(x) __tg_real_complex(asin, (x))
+ #define asinh(x) __tg_real_complex(asinh, (x))
+-#define assert(x) (void)0
++#define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))
+ #define atan(x) __tg_real_complex(atan, (x))
+ #define atan2(x,y) __tg_real_2(atan2, (x), (y))
+ #define atanh(x) __tg_real_complex(atanh, (x))
+--- a/expected/wasm32-wasi/single/predefined-macros.txt
++++ b/expected/wasm32-wasi/single/predefined-macros.txt
+@@ -1119,7 +1119,6 @@
  #define NAN (0.0f/0.0f)
  #define NBBY 8
  #define NCARGS 131072

diff --git a/debian/patches/disable-warning.patch b/debian/patches/disable-warning.patch
index feb913a9df6e156c00d05cf9139e4f803d3dce4a..46098d48217cbc548f445767fc8c0117db0e64fb 100644 (file)
--- a/debian/patches/disable-warning.patch
+++ b/debian/patches/disable-warning.patch
@@ -1,8 +1,6 @@
-Index: wasi-libc/Makefile
-===================================================================
---- wasi-libc.orig/Makefile
-+++ wasi-libc/Makefile
-@@ -207,6 +207,7 @@ CFLAGS += -Wall -Wextra -Werror \
+--- a/Makefile
++++ b/Makefile
+@@ -294,6 +294,7 @@
    -Wno-missing-braces \
    -Wno-ignored-pragmas \
    -Wno-unused-but-set-variable \

diff --git a/debian/patches/dont-rebuild-install.patch b/debian/patches/dont-rebuild-install.patch
index e90b77f991c6a4f143e48a4f4bc51bd348a1938c..a72b0063de370a7c8e676e939bc1c753dded6796 100644 (file)
--- a/debian/patches/dont-rebuild-install.patch
+++ b/debian/patches/dont-rebuild-install.patch
@@ -1,8 +1,6 @@
-Index: wasi-libc/Makefile
-===================================================================
---- wasi-libc.orig/Makefile
-+++ wasi-libc/Makefile
-@@ -449,6 +449,8 @@ include_dirs:
+--- a/Makefile
++++ b/Makefile
+@@ -556,6 +556,8 @@
        # Remove selected header files.
        $(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
  
@@ -11,7 +9,7 @@ Index: wasi-libc/Makefile
  startup_files: include_dirs
        #
        # Build the startup files.
-@@ -459,6 +461,8 @@ startup_files: include_dirs
+@@ -566,6 +568,8 @@
        mkdir -p "$(SYSROOT_LIB)" && \
        mv *.o "$(SYSROOT_LIB)"
  
@@ -20,7 +18,7 @@ Index: wasi-libc/Makefile
  libc: include_dirs \
      $(SYSROOT_LIB)/libc.a \
      $(SYSROOT_LIB)/libc-printscan-long-double.a \
-@@ -468,6 +472,8 @@ libc: include_dirs \
+@@ -575,6 +579,8 @@
      $(SYSROOT_LIB)/libwasi-emulated-getpid.a \
      $(SYSROOT_LIB)/libwasi-emulated-signal.a
  
@@ -29,7 +27,7 @@ Index: wasi-libc/Makefile
  finish: startup_files libc
        #
        # Create empty placeholder libraries.
-@@ -479,6 +485,7 @@ finish: startup_files libc
+@@ -586,6 +592,7 @@
        #
        # The build succeeded! The generated sysroot is in $(SYSROOT).
        #
@@ -37,7 +35,7 @@ Index: wasi-libc/Makefile
  
  # The check for defined and undefined symbols expects there to be a heap
  # alloctor (providing malloc, calloc, free, etc). Skip this step if the build
-@@ -580,5 +587,6 @@ install: finish
+@@ -687,5 +694,6 @@
  clean:
        $(RM) -r "$(OBJDIR)"
        $(RM) -r "$(SYSROOT)"