- cross compilation patch

Changed files:
    crossmingw32-bzip2.patch -> 1.1

diff --git a/crossmingw32-bzip2.patch b/crossmingw32-bzip2.patch
new file mode 100644 (file)
index 0000000..fbb6cf0
--- /dev/null
+++ b/crossmingw32-bzip2.patch
@@ -0,0 +1,113 @@
+diff -uNr bzip2-1.0.1/bzip2.c bzip2-1.0.1.good/bzip2.c
+--- bzip2-1.0.1/bzip2.c        2000-04-25 23:34:06.000000000 +0200
++++ bzip2-1.0.1.good/bzip2.c   2003-08-27 16:20:48.932133328 +0200
+@@ -211,7 +211,7 @@
+ #if BZ_LCCWIN32
+ #   include <io.h>
+ #   include <fcntl.h>
+-#   include <sys\stat.h>
++#   include <sys/stat.h>
+ 
+ #   define NORETURN       /**/
+ #   define PATH_SEP       '\\'
+diff -uNr bzip2-1.0.1/libbz2.def bzip2-1.0.1.good/libbz2.def
+--- bzip2-1.0.1/libbz2.def     2000-05-16 23:35:52.000000000 +0200
++++ bzip2-1.0.1.good/libbz2.def        2003-08-27 16:20:03.627020752 +0200
+@@ -1,27 +1,27 @@
+ LIBRARY                       LIBBZ2\r
+ DESCRIPTION           "libbzip2: library for data compression"\r
+ EXPORTS\r
+-      BZ2_bzCompressInit\r
+-      BZ2_bzCompress\r
+-      BZ2_bzCompressEnd\r
+-      BZ2_bzDecompressInit\r
+-      BZ2_bzDecompress\r
+-      BZ2_bzDecompressEnd\r
+-      BZ2_bzReadOpen\r
+-      BZ2_bzReadClose\r
+-      BZ2_bzReadGetUnused\r
+-      BZ2_bzRead\r
+-      BZ2_bzWriteOpen\r
+-      BZ2_bzWrite\r
+-      BZ2_bzWriteClose\r
+-      BZ2_bzWriteClose64\r
+-      BZ2_bzBuffToBuffCompress\r
+-      BZ2_bzBuffToBuffDecompress\r
+-      BZ2_bzlibVersion\r
+-      BZ2_bzopen\r
+-      BZ2_bzdopen\r
+-      BZ2_bzread\r
+-      BZ2_bzwrite\r
+-      BZ2_bzflush\r
+-      BZ2_bzclose\r
+-      BZ2_bzerror\r
++      BZ2_bzCompressInit@16\r
++      BZ2_bzCompress@8\r
++      BZ2_bzCompressEnd@4\r
++      BZ2_bzDecompressInit@12\r
++      BZ2_bzDecompress@4\r
++      BZ2_bzDecompressEnd@4\r
++      BZ2_bzReadOpen@24\r
++      BZ2_bzReadClose@8\r
++      BZ2_bzReadGetUnused@16\r
++      BZ2_bzRead@16\r
++      BZ2_bzWriteOpen@20\r
++      BZ2_bzWrite@16\r
++      BZ2_bzWriteClose@20\r
++      BZ2_bzWriteClose64@28\r
++      BZ2_bzBuffToBuffCompress@28\r
++      BZ2_bzBuffToBuffDecompress@24\r
++      BZ2_bzlibVersion@0\r
++      BZ2_bzopen@8\r
++      BZ2_bzdopen@8\r
++      BZ2_bzread@12\r
++      BZ2_bzwrite@12\r
++      BZ2_bzflush@4\r
++      BZ2_bzclose@4\r
++      BZ2_bzerror@8\r
+diff -uNr bzip2-1.0.1/Makefile bzip2-1.0.1.good/Makefile
+--- bzip2-1.0.1/Makefile       2000-06-23 22:34:47.000000000 +0200
++++ bzip2-1.0.1.good/Makefile  2003-08-27 16:21:27.380288320 +0200
+@@ -1,8 +1,8 @@
+ 
+ SHELL=/bin/sh
+-CC=gcc
++CC=i386-mingw32-gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS=-I/usr/i386-mingw32/include -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) -D_WIN32
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -12,7 +12,7 @@
+       decompress.o \
+       bzlib.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover
+ 
+ bzip2: libbz2.a bzip2.o
+       $(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
+@@ -22,12 +22,7 @@
+ 
+ libbz2.a: $(OBJS)
+       rm -f libbz2.a
+-      ar cq libbz2.a $(OBJS)
+-      @if ( test -f /usr/bin/ranlib -o -f /bin/ranlib -o \
+-              -f /usr/ccs/bin/ranlib ) ; then \
+-              echo ranlib libbz2.a ; \
+-              ranlib libbz2.a ; \
+-      fi
++      i386-mingw32-dllwrap --def libbz2.def --implib libbz2.a -o libbz2.dll $(OBJS)
+ 
+ test: bzip2
+       @cat words1
+@@ -69,7 +64,7 @@
+       chmod a+r $(PREFIX)/lib/libbz2.a
+ 
+ clean: 
+-      rm -f *.o libbz2.a bzip2 bzip2recover \
++      rm -f *.o libbz2.dll libbz2.a bzip2.exe bzip2recover.exe \
+       sample1.rb2 sample2.rb2 sample3.rb2 \
+       sample1.tst sample2.tst sample3.tst
+