aports

git clone git://git.lin.moe/aports.git

 1diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
 2index b3f94be..ec12470 100755
 3--- a/CPP/7zip/7zip_gcc.mak
 4+++ b/CPP/7zip/7zip_gcc.mak
 5@@ -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
14@@ -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 
29@@ -169,7 +169,7 @@ endif
30 
31 
32 
33-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
34+CFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
35 
36 
37 ifdef IS_MINGW
38@@ -1340,7 +1340,7 @@ predef_cc:
39 	$(CC) $(CFLAGS) -E $(SHOW_PREDEF)  ../../../../C/CpuArch.c > predef_cc_log
40 #	$(CC) $(CFLAGS) -E -dM -  < /dev/null
41 predef_cxx:
42-	$(CXX) $(CFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp  > predef_cxx_log
43+	$(CXX) $(CXXFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp  > predef_cxx_log
44 
45 predef: predef_cc predef_cxx
46