chore(deps): improve LZMA dependencies resolution during pre-processing.

On OSX, multiple types are not automatically resolved during pre-processing because different implementations of LZMA in the LZMA directory have a file named "LZMA.h". Fixed by renaming them to "LZMA2.h" and "LZMA3.h" while adapting the include macros. Discussion: devttys0/sasquatch#6 (comment)
onekey-sec · Feb 28, 2023 · a67de05 · a67de05
1 parent e5454d5
commit a67de05
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 3 deletions.
diff --git a/...A/lzmadaptive/C/7zip/Compress/LZMA/LZMA.h → .../lzmadaptive/C/7zip/Compress/LZMA/LZMA2.h b/...A/lzmadaptive/C/7zip/Compress/LZMA/LZMA.h → .../lzmadaptive/C/7zip/Compress/LZMA/LZMA2.h
diff --git a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMADecoder.h
@@ -9,7 +9,7 @@
 #include "../LZ/LZOutWindow.h"
 #include "../RangeCoder/RangeCoderBitTree.h"
 
-#include "LZMA.h"
+#include "LZMA2.h"
 
 namespace NCompress {
 namespace NLZMA {

diff --git a/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h b/squashfs-tools/LZMA/lzmadaptive/C/7zip/Compress/LZMA/LZMAEncoder.h
@@ -9,7 +9,7 @@
 #include "../LZ/IMatchFinder.h"
 #include "../RangeCoder/RangeCoderBitTree.h"
 
-#include "LZMA.h"
+#include "LZMA2.h"
 
 namespace NCompress {
 namespace NLZMA {

diff --git a/squashfs-tools/LZMA/lzmalt/LZMA.h → squashfs-tools/LZMA/lzmalt/LZMA3.h b/squashfs-tools/LZMA/lzmalt/LZMA.h → squashfs-tools/LZMA/lzmalt/LZMA3.h
diff --git a/squashfs-tools/LZMA/lzmalt/LZMADecoder.h b/squashfs-tools/LZMA/lzmalt/LZMADecoder.h
@@ -2,7 +2,7 @@
 #define __LZARITHMETIC_DECODER_H
 
 #include "WindowOut.h"
-#include "LZMA.h"
+#include "LZMA3.h"
 #include "LenCoder.h"
 #include "LiteralCoder.h"
 

diff --git a/squashfs-tools/xz_wrapper.h b/squashfs-tools/xz_wrapper.h
@@ -25,6 +25,7 @@
  */
 
 #include "endian_compat.h"
+#include <lzma.h>
 
 #if __BYTE_ORDER == __BIG_ENDIAN || defined FIX_BE
 extern unsigned int inswap_le32(unsigned int);