|
1 | 1 | adapted from https://sources.debian.org/patches/7zip/22.01+dfsg-4/0001-Accept-Debian-build-flags.patch/ |
2 | 2 | and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1f2ee41fd2aea9ac/community/7zip/7-zip-flags.patch |
| 3 | + |
| 4 | +diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak |
| 5 | +index f78d16e..c4a62e0 100644 |
3 | 6 | --- a/CPP/7zip/7zip_gcc.mak |
4 | 7 | +++ b/CPP/7zip/7zip_gcc.mak |
5 | 8 | @@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s |
6 | | - |
7 | | - |
8 | | - ifneq ($(CC), xlc) |
9 | | --CFLAGS_WARN_WALL = -Werror -Wall -Wextra |
10 | | -+CFLAGS_WARN_WALL = -Wall -Wextra |
11 | | - endif |
12 | | - |
13 | | - # for object file |
| 9 | + |
| 10 | + |
| 11 | + ifneq ($(CC), xlc) |
| 12 | +-CFLAGS_WARN_WALL = -Werror -Wall -Wextra |
| 13 | ++CFLAGS_WARN_WALL = -Wall -Wextra |
| 14 | + endif |
| 15 | + |
| 16 | + # for object file |
14 | 17 | @@ -45,12 +45,12 @@ CFLAGS_DEBUG = -g |
15 | | - else |
16 | | - CFLAGS_DEBUG = -DNDEBUG |
17 | | - ifneq ($(CC), $(CROSS_COMPILE)clang) |
18 | | --LFLAGS_STRIP = -s |
19 | | -+LFLAGS_STRIP = |
20 | | - endif |
21 | | - endif |
22 | | - |
23 | | - # CFLAGS_BASE_LIST = -S |
24 | | --CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ |
25 | | -+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ |
26 | | - $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ |
27 | | - -fPIC |
28 | | - |
| 18 | + else |
| 19 | + CFLAGS_DEBUG = -DNDEBUG |
| 20 | + ifneq ($(CC), $(CROSS_COMPILE)clang) |
| 21 | +-LFLAGS_STRIP = -s |
| 22 | ++LFLAGS_STRIP = |
| 23 | + endif |
| 24 | + endif |
| 25 | + |
| 26 | + # CFLAGS_BASE_LIST = -S |
| 27 | +-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ |
| 28 | ++CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ |
| 29 | + $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ |
| 30 | + -fPIC |
| 31 | + |
29 | 32 | @@ -111,7 +111,7 @@ endif |
30 | | - |
31 | | - else |
32 | | - |
33 | | --LDFLAGS = $(LDFLAGS_STATIC) |
34 | | -+LDFLAGS = $(VOID_LDFLAGS) $(LDFLAGS_STATIC) |
35 | | - # -z force-bti |
36 | | - # -s is not required for clang, do we need it for GCC ??? |
37 | | - |
38 | | -@@ -169,7 +169,7 @@ endif |
39 | | - |
40 | | - |
41 | | - |
42 | | --CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@ |
43 | | -+CFLAGS = $(VOID_CFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@ |
44 | | - |
45 | | - |
46 | | - ifdef IS_MINGW |
47 | | -@@ -210,7 +210,7 @@ CXX_WARN_FLAGS = |
48 | | - #-Wno-invalid-offsetof |
49 | | - #-Wno-reorder |
50 | | - |
51 | | --CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXX_INCLUDE_FLAGS) -o $@ |
52 | | -+CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXX_INCLUDE_FLAGS) -o $@ |
53 | | - |
54 | | - STATIC_TARGET= |
55 | | - ifdef COMPL_STATIC |
| 33 | + |
| 34 | + else |
| 35 | + |
| 36 | +-LDFLAGS = $(LDFLAGS_STATIC) |
| 37 | ++LDFLAGS = $(VOID_LDFLAGS) $(LDFLAGS_STATIC) |
| 38 | + # -z force-bti |
| 39 | + # -s is not required for clang, do we need it for GCC ??? |
| 40 | + |
| 41 | +@@ -168,7 +168,7 @@ endif |
| 42 | + |
| 43 | + |
| 44 | + |
| 45 | +-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@ |
| 46 | ++CFLAGS = $(VOID_CFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@ |
| 47 | + |
| 48 | + |
| 49 | + ifdef IS_MINGW |
| 50 | +@@ -209,7 +209,7 @@ CXX_WARN_FLAGS = |
| 51 | + #-Wno-invalid-offsetof |
| 52 | + #-Wno-reorder |
| 53 | + |
| 54 | +-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXX_INCLUDE_FLAGS) -o $@ |
| 55 | ++CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(CXX_INCLUDE_FLAGS) -o $@ |
| 56 | + |
| 57 | + STATIC_TARGET= |
| 58 | + ifdef COMPL_STATIC |
0 commit comments