From 6c49a3acb41dcc90cdbbc43583115bbf3fc74889 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Mon, 28 Apr 2025 14:56:43 +0700
Subject: [PATCH 1/2] Makefile: suppress several warnings during 7-zip
 compilation

---
 Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 85963a3c..5d63f158 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,10 @@ LIBS_LZ4 = $(shell $(PKG_CONFIG) --libs liblz4)
 CFLAGS_ZLIB = $(shell $(PKG_CONFIG) --cflags zlib)
 LIBS_ZLIB = $(shell $(PKG_CONFIG) --libs zlib)
 
+CFLAGS_7ZIP = -Wno-sign-compare -Wno-unused-parameter -Wno-misleading-indentation \
+	      -Wno-parentheses
+CXXFLAGS_7ZIP = $(CFLAGS_7ZIP) -Wno-reorder -Wno-class-memaccess
+
 DEP_FLAGS := $(CFLAGS_UV) $(CFLAGS_LZ4) $(CFLAGS_ZLIB)
 LIBS := $(LIBS_UV) $(LIBS_LZ4) $(LIBS_ZLIB)
 
@@ -86,6 +90,8 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c $(OBJDIR)/.done
 maxcso: $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ $(LIBS)
 
+$(SRC_7ZIP): override CFLAGS := $(CFLAGS_7ZIP) $(CFLAGS)
+$(SRC_7ZIP): override CXXFLAGS := $(CXXFLAGS_7ZIP) $(CXXFLAGS)
 $(SRC_7ZIP):
 	$(MAKE) -f $(SRCDIR)/7zip/Makefile 7zip.a
 

From 5185c07daf5d789041f527b2c7b1a5a585207f31 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Mon, 28 Apr 2025 14:57:09 +0700
Subject: [PATCH 2/2] Makefile: support linking to external libzopfli

There is no pkg-config for libzopfli, so hardcode a `-lzopfli`.
---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5d63f158..749178e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 SRCDIR := $(abspath $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
 
 USE_EXTERNAL_LIBDEFLATE ?= 0
+USE_EXTERNAL_LIBZOPFLI ?= 0
 
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
@@ -66,7 +67,7 @@ endif
 SRC_7ZIP := $(OBJDIR)/7zip/7zip.a
 SRC_LIBDEFLATE := $(SRCDIR)/libdeflate/$(LIBDEFLATE)
 
-OBJS := $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) $(SRC_7ZIP)
+OBJS := $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(SRC_7ZIP)
 
 ifeq ($(USE_EXTERNAL_LIBDEFLATE), 0)
 	OBJS += $(SRC_LIBDEFLATE)
@@ -77,6 +78,12 @@ else
 	LIBS += $(LIBS_LIBDEFLATE)
 endif
 
+ifeq ($(USE_EXTERNAL_LIBZOPFLI), 0)
+	OBJS += $(ZOPFLI_C_OBJ)
+else
+	LIBS += -lzopfli
+endif
+
 .PHONY: all clean install uninstall
 
 all: maxcso