Initial commit
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
This commit is contained in:
11
tools/lzma/patches/001-large_files.patch
Normal file
11
tools/lzma/patches/001-large_files.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
|
||||
+++ b/CPP/7zip/Compress/LZMA_Alone/makefile.gcc
|
||||
@@ -3,7 +3,7 @@ CXX = g++ -O2 -Wall
|
||||
CXX_C = gcc -O2 -Wall
|
||||
LIB = -lm
|
||||
RM = rm -f
|
||||
-CFLAGS = -c
|
||||
+CFLAGS = -c -D_FILE_OFFSET_BITS=64
|
||||
|
||||
ifdef SystemDrive
|
||||
IS_MINGW = 1
|
||||
1049
tools/lzma/patches/002-lzmp.patch
Normal file
1049
tools/lzma/patches/002-lzmp.patch
Normal file
File diff suppressed because it is too large
Load Diff
24
tools/lzma/patches/003-compile_fixes.patch
Normal file
24
tools/lzma/patches/003-compile_fixes.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
--- a/CPP/7zip/Common/FileStreams.h
|
||||
+++ b/CPP/7zip/Common/FileStreams.h
|
||||
@@ -72,6 +72,7 @@ class COutFileStream:
|
||||
public IOutStream,
|
||||
public CMyUnknownImp
|
||||
{
|
||||
+public:
|
||||
#ifdef USE_WIN_FILE
|
||||
NWindows::NFile::NIO::COutFile File;
|
||||
#else
|
||||
--- a/CPP/Common/MyWindows.h
|
||||
+++ b/CPP/Common/MyWindows.h
|
||||
@@ -101,8 +101,11 @@ typedef LONG SCODE;
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
+#ifndef INITGUID
|
||||
+#define INITGUID
|
||||
DEFINE_GUID(IID_IUnknown,
|
||||
0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
|
||||
+#endif
|
||||
struct IUnknown
|
||||
{
|
||||
STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE;
|
||||
70
tools/lzma/patches/100-static_library.patch
Normal file
70
tools/lzma/patches/100-static_library.patch
Normal file
@@ -0,0 +1,70 @@
|
||||
--- a/C/LzmaUtil/makefile.gcc
|
||||
+++ b/C/LzmaUtil/makefile.gcc
|
||||
@@ -1,44 +1,53 @@
|
||||
PROG = lzma
|
||||
-CXX = g++
|
||||
-LIB =
|
||||
+CC = gcc
|
||||
+LIB = liblzma.a
|
||||
RM = rm -f
|
||||
CFLAGS = -c -O2 -Wall
|
||||
+AR = ar
|
||||
+RANLIB = ranlib
|
||||
|
||||
OBJS = \
|
||||
- LzmaUtil.o \
|
||||
Alloc.o \
|
||||
LzFind.o \
|
||||
LzmaDec.o \
|
||||
LzmaEnc.o \
|
||||
+ LzmaLib.o \
|
||||
7zFile.o \
|
||||
7zStream.o \
|
||||
|
||||
-
|
||||
all: $(PROG)
|
||||
|
||||
-$(PROG): $(OBJS)
|
||||
- $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2)
|
||||
+$(PROG): LzmaUtil.o $(LIB)
|
||||
+ $(CC) -o $(PROG) $(LDFLAGS) $< $(LIB)
|
||||
|
||||
LzmaUtil.o: LzmaUtil.c
|
||||
- $(CXX) $(CFLAGS) LzmaUtil.c
|
||||
+ $(CC) $(CFLAGS) LzmaUtil.c
|
||||
+
|
||||
+$(LIB): $(OBJS)
|
||||
+ rm -f $@
|
||||
+ $(AR) rcu $@ $(OBJS)
|
||||
+ $(RANLIB) $@
|
||||
|
||||
Alloc.o: ../Alloc.c
|
||||
- $(CXX) $(CFLAGS) ../Alloc.c
|
||||
+ $(CC) $(CFLAGS) ../Alloc.c
|
||||
|
||||
LzFind.o: ../LzFind.c
|
||||
- $(CXX) $(CFLAGS) ../LzFind.c
|
||||
+ $(CC) $(CFLAGS) ../LzFind.c
|
||||
|
||||
LzmaDec.o: ../LzmaDec.c
|
||||
- $(CXX) $(CFLAGS) ../LzmaDec.c
|
||||
+ $(CC) $(CFLAGS) ../LzmaDec.c
|
||||
|
||||
LzmaEnc.o: ../LzmaEnc.c
|
||||
- $(CXX) $(CFLAGS) ../LzmaEnc.c
|
||||
+ $(CC) $(CFLAGS) ../LzmaEnc.c
|
||||
+
|
||||
+LzmaLib.o: ../LzmaLib.c
|
||||
+ $(CC) $(CFLAGS) ../LzmaLib.c
|
||||
|
||||
7zFile.o: ../7zFile.c
|
||||
- $(CXX) $(CFLAGS) ../7zFile.c
|
||||
+ $(CC) $(CFLAGS) ../7zFile.c
|
||||
|
||||
7zStream.o: ../7zStream.c
|
||||
- $(CXX) $(CFLAGS) ../7zStream.c
|
||||
+ $(CC) $(CFLAGS) ../7zStream.c
|
||||
|
||||
clean:
|
||||
- -$(RM) $(PROG) $(OBJS)
|
||||
+ -$(RM) $(PROG) *.o *.a
|
||||
20
tools/lzma/patches/101-move-copyright-to-usage-info.patch
Normal file
20
tools/lzma/patches/101-move-copyright-to-usage-info.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
--- a/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp
|
||||
+++ b/CPP/7zip/Compress/LZMA_Alone/LzmaAlone.cpp
|
||||
@@ -101,6 +101,8 @@ static const int kNumSwitches = sizeof(k
|
||||
|
||||
static void PrintHelp()
|
||||
{
|
||||
+ fprintf(stderr, "\nLZMA " MY_VERSION_COPYRIGHT_DATE "\n");
|
||||
+
|
||||
fprintf(stderr, "\nUsage: LZMA <e|d> inputFile outputFile [<switches>...]\n"
|
||||
" e: encode file\n"
|
||||
" d: decode file\n"
|
||||
@@ -168,8 +170,6 @@ int main2(int n, const char *args[])
|
||||
g_IsNT = IsItWindowsNT();
|
||||
#endif
|
||||
|
||||
- fprintf(stderr, "\nLZMA " MY_VERSION_COPYRIGHT_DATE "\n");
|
||||
-
|
||||
if (n == 1)
|
||||
{
|
||||
PrintHelp();
|
||||
Reference in New Issue
Block a user