X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2F7z%2Fpatches%2F7-zip-flags.patch;h=b9b2152f22a677851ff9d05f84f75bd0e3eaec91;hb=4ca450deaca133b14a7798ab1803129c3f26353a;hp=ed5b5084018f4f8e3461d9c58fe15d696260332a;hpb=11bf820124e3155ef6b1762cd3ca533b9a7d577d;p=openwrt%2Fstaging%2Fjow.git

diff --git a/tools/7z/patches/7-zip-flags.patch b/tools/7z/patches/7-zip-flags.patch
index ed5b508401..b9b2152f22 100644
--- 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
  
  
  ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra
 +CFLAGS_WARN_WALL = -Wall -Wextra
  endif
  
  # for object file
+@@ -32,7 +32,7 @@ endif
+ # -save-temps
  CFLAGS_BASE_LIST = -c
  # CFLAGS_BASE_LIST = -S
 -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
@@ -16,12 +18,3 @@
   -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
   -fPIC
  
-@@ -192,7 +192,7 @@ all: $(O) $(PROGPATH) $(STATIC_TARGET)
- $(O):
- 	$(MY_MKDIR) $(O)
- 
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- 	$(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
-