rebase patches

some dirs got moved/renamed.

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 3c8ef0b380627b123bbfd532c46ee458eacef21c..3f7689d47548cbf60db217691cc84f923590374f 100644 (file)
--- a/debian/patches/debian-flags.patch
+++ b/debian/patches/debian-flags.patch
@@ -1,5 +1,7 @@
---- a/expected/wasm32-wasi/posix/predefined-macros.txt
-+++ b/expected/wasm32-wasi/posix/predefined-macros.txt
+Index: wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
+===================================================================
+--- wasi-libc.orig/expected/wasm32-wasi-threads/predefined-macros.txt
++++ wasi-libc/expected/wasm32-wasi-threads/predefined-macros.txt
 @@ -1119,7 +1119,6 @@
  #define NAN (0.0f/0.0f)
  #define NBBY 8
@@ -8,7 +10,7 @@
  #define ND_NA_FLAG_OVERRIDE 0x00000020
  #define ND_NA_FLAG_ROUTER 0x00000080
  #define ND_NA_FLAG_SOLICITED 0x00000040
-@@ -3113,7 +3112,7 @@
+@@ -3112,7 +3111,7 @@
  #define and_eq &=
  #define asin(x) __tg_real_complex(asin, (x))
  #define asinh(x) __tg_real_complex(asinh, (x))
@@ -17,8 +19,10 @@
  #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
+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
 @@ -1119,7 +1119,6 @@
  #define NAN (0.0f/0.0f)
  #define NBBY 8

diff --git a/debian/patches/disable-warning.patch b/debian/patches/disable-warning.patch
index 46098d48217cbc548f445767fc8c0117db0e64fb..c1fd84515d59a0d989232855b0fa6eac62ebc70e 100644 (file)
--- a/debian/patches/disable-warning.patch
+++ b/debian/patches/disable-warning.patch
@@ -1,6 +1,8 @@
---- a/Makefile
-+++ b/Makefile
-@@ -294,6 +294,7 @@
+Index: wasi-libc/Makefile
+===================================================================
+--- wasi-libc.orig/Makefile
++++ wasi-libc/Makefile
+@@ -310,6 +310,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 a72b0063de370a7c8e676e939bc1c753dded6796..261b827064b6f31e3a9faf4bfb4fca9a1d918e04 100644 (file)
--- a/debian/patches/dont-rebuild-install.patch
+++ b/debian/patches/dont-rebuild-install.patch
@@ -1,6 +1,8 @@
---- a/Makefile
-+++ b/Makefile
-@@ -556,6 +556,8 @@
+Index: wasi-libc/Makefile
+===================================================================
+--- wasi-libc.orig/Makefile
++++ wasi-libc/Makefile
+@@ -577,6 +577,8 @@ include_dirs:
        # Remove selected header files.
        $(RM) $(patsubst %,$(SYSROOT_INC)/%,$(MUSL_OMIT_HEADERS))
  
@@ -9,7 +11,7 @@
  startup_files: include_dirs
        #
        # Build the startup files.
-@@ -566,6 +568,8 @@
+@@ -587,6 +589,8 @@ startup_files: include_dirs
        mkdir -p "$(SYSROOT_LIB)" && \
        mv *.o "$(SYSROOT_LIB)"
  
@@ -18,7 +20,7 @@
  libc: include_dirs \
      $(SYSROOT_LIB)/libc.a \
      $(SYSROOT_LIB)/libc-printscan-long-double.a \
-@@ -575,6 +579,8 @@
+@@ -596,6 +600,8 @@ libc: include_dirs \
      $(SYSROOT_LIB)/libwasi-emulated-getpid.a \
      $(SYSROOT_LIB)/libwasi-emulated-signal.a
  
@@ -27,7 +29,7 @@
  finish: startup_files libc
        #
        # Create empty placeholder libraries.
-@@ -586,6 +592,7 @@
+@@ -607,6 +613,7 @@ finish: startup_files libc
        #
        # The build succeeded! The generated sysroot is in $(SYSROOT).
        #
@@ -35,7 +37,7 @@
  
  # 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
-@@ -687,5 +694,6 @@
+@@ -712,5 +719,6 @@ install: finish
  clean:
        $(RM) -r "$(OBJDIR)"
        $(RM) -r "$(SYSROOT)"