From: YOKOTA Hiroshi <yokota.hgml@gmail.com>
Date: Tue, 30 May 2023 20:11:52 +0900
Subject: Add RAR plugin builder

Forwarded: not-needed

RAR support is separated to another plugin and main package keeps DFSG
---
 CPP/7zip/Bundles/CodecRAR/Arc_gcc.mak              | 126 +++++++++++++++++++++
 .../Bundles/{Format7zF => CodecRAR}/makefile.gcc   | 110 +++++++++---------
 2 files changed, 179 insertions(+), 57 deletions(-)
 create mode 100644 CPP/7zip/Bundles/CodecRAR/Arc_gcc.mak
 copy CPP/7zip/Bundles/{Format7zF => CodecRAR}/makefile.gcc (51%)

diff --git a/CPP/7zip/Bundles/CodecRAR/Arc_gcc.mak b/CPP/7zip/Bundles/CodecRAR/Arc_gcc.mak
new file mode 100644
index 0000000..a01d114
--- /dev/null
+++ b/CPP/7zip/Bundles/CodecRAR/Arc_gcc.mak
@@ -0,0 +1,126 @@
+
+LOCAL_FLAGS_ST =
+MT_OBJS =
+
+ifdef SystemDrive
+IS_MINGW = 1
+else
+ifdef SYSTEMDRIVE
+# ifdef OS
+IS_MINGW = 1
+endif
+endif
+
+ifdef ST_MODE
+
+LOCAL_FLAGS_ST = -DZ7_ST
+
+ifdef IS_MINGW
+MT_OBJS =
+
+endif
+
+else
+
+MT_OBJS =
+
+endif
+
+
+
+COMMON_OBJS = \
+  $O/CRC.o
+
+WIN_OBJS =
+
+7ZIP_COMMON_OBJS = \
+  $O/InBuffer.o \
+  $O/OutBuffer.o \
+  $O/StreamUtils.o
+
+AR_OBJS =
+
+AR_COMMON_OBJS =
+
+
+7Z_OBJS =
+
+CAB_OBJS =
+
+CHM_OBJS =
+
+ISO_OBJS =
+
+NSIS_OBJS =
+
+ifndef DISABLE_RAR
+RAR_OBJS =
+
+endif
+
+
+TAR_OBJS =
+
+UDF_OBJS =
+
+WIM_OBJS =
+
+ZIP_OBJS =
+
+COMPRESS_OBJS = \
+  $O/LzOutWindow.o
+
+ifdef DISABLE_RAR
+DISABLE_RAR_COMPRESS=1
+endif
+
+ifndef DISABLE_RAR_COMPRESS
+COMPRESS_OBJS += \
+  $O/Rar1Decoder.o \
+  $O/Rar2Decoder.o \
+  $O/Rar3Decoder.o \
+  $O/Rar3Vm.o \
+  $O/Rar5Decoder.o \
+  $O/RarCodecsRegister.o
+
+endif
+
+CRYPTO_OBJS =
+
+ifndef DISABLE_RAR
+CRYPTO_OBJS +=
+
+endif
+
+
+C_OBJS = \
+  $O/Alloc.o \
+  $O/CpuArch.o \
+  $O/Ppmd7.o \
+  $O/Ppmd7Dec.o \
+  $O/Ppmd7aDec.o \
+  $O/7zCrc.o \
+  $O/7zCrcOpt.o
+
+ARC_OBJS = \
+  $(LZMA_DEC_OPT_OBJS) \
+  $(C_OBJS) \
+  $(MT_OBJS) \
+  $(COMMON_OBJS) \
+  $(WIN_OBJS) \
+  $(AR_OBJS) \
+  $(AR_COMMON_OBJS) \
+  $(7Z_OBJS) \
+  $(CAB_OBJS) \
+  $(CHM_OBJS) \
+  $(COM_OBJS) \
+  $(ISO_OBJS) \
+  $(NSIS_OBJS) \
+  $(RAR_OBJS) \
+  $(TAR_OBJS) \
+  $(UDF_OBJS) \
+  $(WIM_OBJS) \
+  $(ZIP_OBJS) \
+  $(COMPRESS_OBJS) \
+  $(CRYPTO_OBJS) \
+  $(7ZIP_COMMON_OBJS)
diff --git a/CPP/7zip/Bundles/Format7zF/makefile.gcc b/CPP/7zip/Bundles/CodecRAR/makefile.gcc
similarity index 51%
copy from CPP/7zip/Bundles/Format7zF/makefile.gcc
copy to CPP/7zip/Bundles/CodecRAR/makefile.gcc
index 63bc9ec..b657ef0 100644
--- a/CPP/7zip/Bundles/Format7zF/makefile.gcc
+++ b/CPP/7zip/Bundles/CodecRAR/makefile.gcc
@@ -1,57 +1,53 @@
-PROG = 7z
-DEF_FILE = ../../Archive/Archive2.def
-
-# IS_X64 = 1
-# USE_ASM = 1
-# ST_MODE = 1
-
-include Arc_gcc.mak
-
-ifdef SystemDrive
-IS_MINGW = 1
-else
-ifdef SYSTEMDRIVE
-# ifdef OS
-IS_MINGW = 1
-endif
-endif
-
-LOCAL_FLAGS_SYS =
-
-ifdef IS_MINGW
-
-LOCAL_FLAGS_SYS = \
-  $(LOCAL_FLAGS_ST) \
-
-#  -DZ7_LARGE_PAGES \
-
-SYS_OBJS = \
-  $O/resource.o \
-
-else
-
-SYS_OBJS = \
-  $O/MyWindows.o \
-
-endif
-
-LOCAL_FLAGS = \
-  -DZ7_EXTERNAL_CODECS \
-  $(LOCAL_FLAGS_SYS) \
-  $(LOCAL_FLAGS_ST) \
-
-
-COMPRESS_OBJS_2 = \
-  $O/CodecExports.o \
-
-AR_OBJS_2 = \
-  $O/ArchiveExports.o \
-  $O/DllExports2.o \
-
-OBJS = \
-  $(ARC_OBJS) \
-  $(AR_OBJS_2) \
-  $(COMPRESS_OBJS_2) \
-  $(SYS_OBJS) \
-
-include ../../7zip_gcc.mak
+PROG = Rar
+DEF_FILE = ../../Compress/Codec.def
+
+# IS_X64 = 1
+# USE_ASM = 1
+# ST_MODE = 1
+
+include Arc_gcc.mak
+
+ifdef SystemDrive
+IS_MINGW = 1
+else
+ifdef SYSTEMDRIVE
+# ifdef OS
+IS_MINGW = 1
+endif
+endif
+
+
+ifdef IS_MINGW
+
+LOCAL_FLAGS_WIN = \
+  -DZ7_LARGE_PAGES \
+  $(LOCAL_FLAGS_ST)
+
+SYS_OBJS = 
+
+else
+
+SYS_OBJS = \
+  $O/MyWindows.o
+
+endif
+
+LOCAL_FLAGS = \
+  -DZ7_EXTERNAL_CODECS \
+  $(LOCAL_FLAGS_WIN) \
+  $(LOCAL_FLAGS_ST)
+
+
+COMPRESS_OBJS_2 = \
+  $O/CodecExports.o \
+  $O/DllExportsCompress.o
+
+AR_OBJS_2 =
+
+OBJS = \
+  $(ARC_OBJS) \
+  $(AR_OBJS_2) \
+  $(COMPRESS_OBJS_2) \
+  $(SYS_OBJS)
+
+include ../../7zip_gcc.mak