changes to get lzma to compile

diff --git a/Makefile b/Makefile
index ff9f4c94eccdc6473a7a65e15e58e542a813c13a..7ed73d374298dddfeeafdddd2cce7c4efcb726a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,19 @@
-CFLAGS=-Wall -std=c99 -I. -Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4 -D_POSIX_C_SOURCE=1
+CFLAGS=-Wall -std=c99 -I. -Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4

 LDFLAGS=-L.
 
 LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.c
 LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
 LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
 LDFLAGS=-L.
 
 LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.c
 LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
 LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 

-def: libzpm.a
+def: programs

 d:
        printf '%s\n' $(LZMAOBJ)
 
 d:
        printf '%s\n' $(LZMAOBJ)
 

+lzma.c: mklzma
+       sh mklzma
+
+lzma.o: lzma.c
+       gcc -std=c99 -Wall -c -o $@ $<

 test: zpm-addfile
        prove -e'' t/*.t
 
 test: zpm-addfile
        prove -e'' t/*.t
 


@@ -21,7 +26,7 @@ elftype: elf/elftype.c
        $(CC) $(CFLAGS) -o $@ $+
 
 soname: elf/soname.c
        $(CC) $(CFLAGS) -o $@ $+
 
 soname: elf/soname.c

-       $(CC) $(CFLAGS) -o $@ $+
+       $(CC) -Ielf $(CFLAGS) -o $@ $+

 
 zpm-addfile: zpm-addfile.o libzpm.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsqlite3 -lzpm
 
 zpm-addfile: zpm-addfile.o libzpm.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsqlite3 -lzpm


@@ -55,4 +60,4 @@ install: elftype
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:

-       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile
+       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile soname

diff --git a/lzma/api/sysdefs.h b/lzma/api/sysdefs.h
index 23b7ad23df34f7217a7902a8feb02efa7487c75c..caa81a5c936d4c70546d74174edd5ed5ed2901ac 100644 (file)
--- a/lzma/api/sysdefs.h
+++ b/lzma/api/sysdefs.h
@@ -16,6 +16,7 @@
 #ifndef LZMA_SYSDEFS_H
 #define LZMA_SYSDEFS_H
 
 #ifndef LZMA_SYSDEFS_H
 #define LZMA_SYSDEFS_H
 

+#define _POSIX_C_SOURCE 199309L

 //////////////
 // Includes //
 //////////////
 //////////////
 // Includes //
 //////////////

diff --git a/lzma/common/alone_decoder.c b/lzma/common/alone_decoder.c
index c1360ca1eb7ade2a4f0b4194a80e39d21742e652..37cfb851d25b5be1c31282f9744d00ca8ef0d5ab 100644 (file)
--- a/lzma/common/alone_decoder.c
+++ b/lzma/common/alone_decoder.c
@@ -10,6 +10,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 //
 ///////////////////////////////////////////////////////////////////////////////
 

+#define _POSIX_C_SOURCE 199309L
+

 #include "alone_decoder.h"
 #include "lzma_decoder.h"
 #include "lz_decoder.h"
 #include "alone_decoder.h"
 #include "lzma_decoder.h"
 #include "lz_decoder.h"

diff --git a/lzma/tuklib/mythread.h b/lzma/tuklib/mythread.h
index 735aa6a6f94617d3780aab5705757bc8f951539a..8cb72d513972f7c7b8c1b82efcc61eac126650a4 100644 (file)
--- a/lzma/tuklib/mythread.h
+++ b/lzma/tuklib/mythread.h
@@ -13,8 +13,11 @@
 #ifndef MYTHREAD_H
 #define MYTHREAD_H
 
 #ifndef MYTHREAD_H
 #define MYTHREAD_H
 

+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 199309L
+#endif
+

 #include "sysdefs.h"
 #include "sysdefs.h"

-#define _POSIX_C_SOURCE 1

 
 // If any type of threading is enabled, #define MYTHREAD_ENABLED.
 #if defined(MYTHREAD_POSIX) || defined(MYTHREAD_WIN95) \
 
 // If any type of threading is enabled, #define MYTHREAD_ENABLED.
 #if defined(MYTHREAD_POSIX) || defined(MYTHREAD_WIN95) \


@@ -22,7 +25,6 @@
 #      define MYTHREAD_ENABLED 1
 #endif
 
 #      define MYTHREAD_ENABLED 1
 #endif
 

-

 #ifdef MYTHREAD_ENABLED
 
 ////////////////////////////////////////
 #ifdef MYTHREAD_ENABLED
 
 ////////////////////////////////////////