tools/7z: update to 23.01

[openwrt/staging/jow.git] / tools / 7z / patches / 7-zip-flags.patch

diff --git a/tools/7z/patches/7-zip-flags.patch b/tools/7z/patches/7-zip-flags.patch
index ed5b5084018f4f8e3461d9c58fe15d696260332a..b9b2152f22a677851ff9d05f84f75bd0e3eaec91 100644 (file)
--- a/tools/7z/patches/7-zip-flags.patch
+++ b/tools/7z/patches/7-zip-flags.patch
@@ -1,14 +1,16 @@
 --- a/CPP/7zip/7zip_gcc.mak
 +++ b/CPP/7zip/7zip_gcc.mak
-@@ -18,13 +18,13 @@ PROGPATH_STATIC = $(O)/$(PROG)s
+@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
  \r
  \r
  ifneq ($(CC), xlc)\r
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra\r
+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra\r
 +CFLAGS_WARN_WALL = -Wall -Wextra\r
  endif\r
  \r
  # for object file\r
+@@ -32,7 +32,7 @@ endif
+ # -save-temps\r
  CFLAGS_BASE_LIST = -c\r
  # CFLAGS_BASE_LIST = -S\r
 -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \\r
@@ -16,12 +18,3 @@
   -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \\r
   -fPIC\r
  \r
-@@ -192,7 +192,7 @@ all: $(O) $(PROGPATH) $(STATIC_TARGET)
- $(O):\r
-       $(MY_MKDIR) $(O)\r
- \r
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)\r
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)\r
- $(PROGPATH): $(OBJS)\r
-       $(CXX) -o $(PROGPATH) $(LFLAGS_ALL)\r
- \r