refresh patches

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

diff --git a/debian/patches/debian-flags.patch b/debian/patches/debian-flags.patch
index 8fe6f76c7fe0cd01328d2a7ab93375cfacdd697a..b56a1e375dec4255787b0c5a9c0b6c6c91b59be2 100644 (file)
--- a/debian/patches/debian-flags.patch
+++ b/debian/patches/debian-flags.patch
@@ -2,7 +2,7 @@ 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
-@@ -1118,7 +1118,6 @@
+@@ -1120,7 +1120,6 @@
  #define NAN (0.0f/0.0f)
  #define NBBY 8
  #define NCARGS 131072
@@ -10,7 +10,7 @@ Index: wasi-libc/expected/wasm32-wasi/predefined-macros.txt
  #define ND_NA_FLAG_OVERRIDE 0x00000020
  #define ND_NA_FLAG_ROUTER 0x00000080
  #define ND_NA_FLAG_SOLICITED 0x00000040
-@@ -3102,7 +3101,7 @@
+@@ -3073,7 +3072,7 @@
  #define and_eq &=
  #define asin(x) __tg_real_complex(asin, (x))
  #define asinh(x) __tg_real_complex(asinh, (x))

diff --git a/debian/patches/disable-warning.patch b/debian/patches/disable-warning.patch
index 3da3daf24cba37af65e8c6488a543f7c79ecc6df..feb913a9df6e156c00d05cf9139e4f803d3dce4a 100644 (file)
--- a/debian/patches/disable-warning.patch
+++ b/debian/patches/disable-warning.patch
@@ -2,7 +2,7 @@ Index: wasi-libc/Makefile
 ===================================================================
 --- wasi-libc.orig/Makefile
 +++ wasi-libc/Makefile
-@@ -199,6 +199,7 @@ CFLAGS += -Wall -Wextra -Werror \
+@@ -207,6 +207,7 @@ CFLAGS += -Wall -Wextra -Werror \
    -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 f2f1186f064ef4036b681aee2cb2d1c3a816fc5e..e90b77f991c6a4f143e48a4f4bc51bd348a1938c 100644 (file)
--- a/debian/patches/dont-rebuild-install.patch
+++ b/debian/patches/dont-rebuild-install.patch
@@ -2,7 +2,7 @@ Index: wasi-libc/Makefile
 ===================================================================
 --- wasi-libc.orig/Makefile
 +++ wasi-libc/Makefile
-@@ -432,6 +432,8 @@ include_dirs:
+@@ -449,6 +449,8 @@ include_dirs:
        # Remove selected header files.
        $(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
  
@@ -11,7 +11,7 @@ Index: wasi-libc/Makefile
  startup_files: include_dirs
        #
        # Build the startup files.
-@@ -442,6 +444,8 @@ startup_files: include_dirs
+@@ -459,6 +461,8 @@ startup_files: include_dirs
        mkdir -p "$(SYSROOT_LIB)" && \
        mv *.o "$(SYSROOT_LIB)"
  
@@ -20,7 +20,7 @@ Index: wasi-libc/Makefile
  libc: include_dirs \
      $(SYSROOT_LIB)/libc.a \
      $(SYSROOT_LIB)/libc-printscan-long-double.a \
-@@ -451,6 +455,8 @@ libc: include_dirs \
+@@ -468,6 +472,8 @@ libc: include_dirs \
      $(SYSROOT_LIB)/libwasi-emulated-getpid.a \
      $(SYSROOT_LIB)/libwasi-emulated-signal.a
  
@@ -29,7 +29,7 @@ Index: wasi-libc/Makefile
  finish: startup_files libc
        #
        # Create empty placeholder libraries.
-@@ -462,6 +468,7 @@ finish: startup_files libc
+@@ -479,6 +485,7 @@ finish: startup_files libc
        #
        # The build succeeded! The generated sysroot is in $(SYSROOT).
        #
@@ -37,13 +37,10 @@ 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
-@@ -550,4 +557,8 @@ install: finish
-       mkdir -p "$(INSTALL_DIR)"
-       cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
+@@ -580,5 +587,6 @@ install: finish
+ clean:
+       $(RM) -r "$(OBJDIR)"
+       $(RM) -r "$(SYSROOT)"
++      $(RM) -f include_dirs startup_files libc finish
  
--.PHONY: default startup_files libc finish install include_dirs
-+clean:
-+      rm -f include_dirs startup_files libc finish
-+      rm -rf build sysroot
-+
-+.PHONY: default install
+ .PHONY: default startup_files libc finish install include_dirs clean