summaryrefslogtreecommitdiff
path: root/app-arch/7-zip/files
diff options
context:
space:
mode:
authorAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-12-16 11:03:16 -0500
committerAlex Xu (Hello71) <alex_y_xu@yahoo.ca>2021-12-16 11:03:16 -0500
commit5c985b11c354d64e99978681c61f581923bc5a50 (patch)
treed0037f14833a2093d4b2b2ecc6d558f830ac6066 /app-arch/7-zip/files
parentc930da71ed9275339c135b430a3fb9e2163c4184 (diff)
downloadgentoo-overlay-5c985b11c354d64e99978681c61f581923bc5a50.tar.xz
gentoo-overlay-5c985b11c354d64e99978681c61f581923bc5a50.zip
app-arch/7-zip: upgrade to 21.06
Diffstat (limited to 'app-arch/7-zip/files')
-rw-r--r--app-arch/7-zip/files/7-zip-flags.patch39
1 files changed, 9 insertions, 30 deletions
diff --git a/app-arch/7-zip/files/7-zip-flags.patch b/app-arch/7-zip/files/7-zip-flags.patch
index 372819d..963037c 100644
--- a/app-arch/7-zip/files/7-zip-flags.patch
+++ b/app-arch/7-zip/files/7-zip-flags.patch
@@ -1,12 +1,12 @@
diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
---- a/CPP/7zip/7zip_gcc.mak 2021-07-16 08:23:49.524088300 -0400
-+++ b/CPP/7zip/7zip_gcc.mak 2021-08-14 14:43:34.618587556 -0400
-@@ -13,13 +13,13 @@
+--- a/CPP/7zip/7zip_gcc.mak 2021-11-20 04:00:00.000000000 -0500
++++ b/CPP/7zip/7zip_gcc.mak 2021-12-16 11:01:16.236763027 -0500
+@@ -14,13 +14,13 @@
ifneq ($(CC), xlc)
-CFLAGS_WARN_WALL = -Wall -Werror -Wextra
-+CFLAGS_WARN_WALL = -Wall -Wextra -Wno-misleading-indentation
++CFLAGS_WARN_WALL = -Wall -Wextra
endif
# for object file
@@ -17,33 +17,12 @@ diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-fPIC
-@@ -62,17 +62,17 @@
-
- ifdef IS_MINGW
- SHARED_EXT=.dll
--LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC)
-+MY_LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC)
- else
- SHARED_EXT=.so
--LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)
-+MY_LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)
- CC_SHARED=-fPIC
- endif
-
-
- else
-
--LDFLAGS = $(LDFLAGS_STATIC)
-+MY_LDFLAGS = $(LDFLAGS_STATIC)
- # -s is not required for clang, do we need it for GGC ???
- # -s
-
-@@ -156,7 +156,7 @@
+@@ -162,7 +162,7 @@
+ $(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) -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+ $(CXX) -o $(PROGPATH) $(MY_ARCH_2) $(LDFLAGS) $(MY_LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-
- # -s strips debug sections from executable in GCC
+ $(CXX) -o $(PROGPATH) $(LFLAGS_ALL)