Please drop CONFIGURE_STYLE and have it use CC/CXX/CFLAGS/CXXFLAGS.
With that it's ok sthen, though I think it might also make sense to
build debug packages.
(There is asm code that could be looked at later but I think this is
pretty good and enough for now).
diff --git a/Makefile b/Makefile
index a16cd22..087b82e 100644
--- a/Makefile
+++ b/Makefile
@@ -35,13 +35,16 @@ COMPILER = base-clang ports-gcc
RUN_DEPENDS-rar = ${BUILD_PKGPATH}
MULTI_PACKAGES = -main -rar
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
USE_GMAKE = Yes
-CONFIGURE_STYLE = none
MAKE_FILE_base-clang = ../../cmpl_clang.mak
MAKE_FILE_ports-gcc = ../../cmpl_gcc.mak
MAKE_FILE = ${MAKE_FILE_${CHOSEN_COMPILER}}
+MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \
+ LOCAL_CFLAGS="${CFLAGS}" \
+ LOCAL_CXXFLAGS="${CXXFLAGS}"
WRKDIST = ${WRKDIR}
WRKSRC = ${WRKDIST}/CPP/7zip
diff --git a/patches/patch-CPP_7zip_7zip_gcc_mak
b/patches/patch-CPP_7zip_7zip_gcc_mak
index 822e59c..0ac3074 100644
--- a/patches/patch-CPP_7zip_7zip_gcc_mak
+++ b/patches/patch-CPP_7zip_7zip_gcc_mak
@@ -10,7 +10,16 @@ Index: CPP/7zip/7zip_gcc.mak
endif
# for object file
-@@ -162,7 +162,7 @@ DEL_OBJ_EXE = -$(RM) $(PROGPATH) $(PROGPATH_STATIC) $(
+@@ -50,7 +50,7 @@ endif
+ endif
+
+ # CFLAGS_BASE_LIST = -S
+-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
++CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
+ $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ -fPIC
+
+@@ -162,14 +162,14 @@ DEL_OBJ_EXE = -$(RM) $(PROGPATH) $(PROGPATH_STATIC) $(
# LOCAL_LIBS=-lpthread
# LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
LIB2 = -lpthread
@@ -19,3 +28,20 @@ Index: CPP/7zip/7zip_gcc.mak
endif
+
+
+
+-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE)
$(FLAGS_FLTO) $(CC_SHARED) -o $@
++CFLAGS = $(LOCAL_CFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2)
$(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
+
+
+ ifdef IS_MINGW
+@@ -210,7 +210,7 @@ CXX_WARN_FLAGS =
+ #-Wno-invalid-offsetof
+ #-Wno-reorder
+
+-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 $@
++CXXFLAGS = $(LOCAL_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 $@
+
+ STATIC_TARGET=
+ ifdef COMPL_STATIC
