crossmingw32-bzip2.patch

   1 diff -uNr bzip2-1.0.1/bzip2.c bzip2-1.0.1.good/bzip2.c
   2 --- bzip2-1.0.1/bzip2.c 2000-04-25 23:34:06.000000000 +0200
   3 +++ bzip2-1.0.1.good/bzip2.c    2003-08-27 16:20:48.932133328 +0200
   4 @@ -211,7 +211,7 @@
   5  #if BZ_LCCWIN32
   6  #   include <io.h>
   7  #   include <fcntl.h>
   8 -#   include <sys\stat.h>
   9 +#   include <sys/stat.h>
  10
  11  #   define NORETURN       /**/
  12  #   define PATH_SEP       '\\'
  13 diff -uNr bzip2-1.0.1/libbz2.def bzip2-1.0.1.good/libbz2.def
  14 --- bzip2-1.0.1/libbz2.def      2000-05-16 23:35:52.000000000 +0200
  15 +++ bzip2-1.0.1.good/libbz2.def 2003-08-27 16:20:03.627020752 +0200
  16 @@ -1,27 +1,27 @@
  17  LIBRARY                        LIBBZ2\r
  18  DESCRIPTION            "libbzip2: library for data compression"\r
  19  EXPORTS\r
  20 -       BZ2_bzCompressInit\r
  21 -       BZ2_bzCompress\r
  22 -       BZ2_bzCompressEnd\r
  23 -       BZ2_bzDecompressInit\r
  24 -       BZ2_bzDecompress\r
  25 -       BZ2_bzDecompressEnd\r
  26 -       BZ2_bzReadOpen\r
  27 -       BZ2_bzReadClose\r
  28 -       BZ2_bzReadGetUnused\r
  29 -       BZ2_bzRead\r
  30 -       BZ2_bzWriteOpen\r
  31 -       BZ2_bzWrite\r
  32 -       BZ2_bzWriteClose\r
  33 -       BZ2_bzWriteClose64\r
  34 -       BZ2_bzBuffToBuffCompress\r
  35 -       BZ2_bzBuffToBuffDecompress\r
  36 -       BZ2_bzlibVersion\r
  37 -       BZ2_bzopen\r
  38 -       BZ2_bzdopen\r
  39 -       BZ2_bzread\r
  40 -       BZ2_bzwrite\r
  41 -       BZ2_bzflush\r
  42 -       BZ2_bzclose\r
  43 -       BZ2_bzerror\r
  44 +       BZ2_bzCompressInit@16\r
  45 +       BZ2_bzCompress@8\r
  46 +       BZ2_bzCompressEnd@4\r
  47 +       BZ2_bzDecompressInit@12\r
  48 +       BZ2_bzDecompress@4\r
  49 +       BZ2_bzDecompressEnd@4\r
  50 +       BZ2_bzReadOpen@24\r
  51 +       BZ2_bzReadClose@8\r
  52 +       BZ2_bzReadGetUnused@16\r
  53 +       BZ2_bzRead@16\r
  54 +       BZ2_bzWriteOpen@20\r
  55 +       BZ2_bzWrite@16\r
  56 +       BZ2_bzWriteClose@20\r
  57 +       BZ2_bzWriteClose64@28\r
  58 +       BZ2_bzBuffToBuffCompress@28\r
  59 +       BZ2_bzBuffToBuffDecompress@24\r
  60 +       BZ2_bzlibVersion@0\r
  61 +       BZ2_bzopen@8\r
  62 +       BZ2_bzdopen@8\r
  63 +       BZ2_bzread@12\r
  64 +       BZ2_bzwrite@12\r
  65 +       BZ2_bzflush@4\r
  66 +       BZ2_bzclose@4\r
  67 +       BZ2_bzerror@8\r
  68 diff -uNr bzip2-1.0.1/Makefile bzip2-1.0.1.good/Makefile
  69 --- bzip2-1.0.1/Makefile        2000-06-23 22:34:47.000000000 +0200
  70 +++ bzip2-1.0.1.good/Makefile   2003-08-27 16:21:27.380288320 +0200
  71 @@ -1,8 +1,8 @@
  72
  73  SHELL=/bin/sh
  74 -CC=gcc
  75 +CC=i386-mingw32-gcc
  76  BIGFILES=-D_FILE_OFFSET_BITS=64
  77 -CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
  78 +CFLAGS=-I/usr/i386-mingw32/include -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) -D_WIN32
  79
  80  OBJS= blocksort.o  \
  81        huffman.o    \
  82 @@ -12,7 +12,7 @@
  83        decompress.o \
  84        bzlib.o
  85
  86 -all: libbz2.a bzip2 bzip2recover test
  87 +all: libbz2.a bzip2 bzip2recover
  88
  89  bzip2: libbz2.a bzip2.o
  90         $(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
  91 @@ -22,12 +22,7 @@
  92
  93  libbz2.a: $(OBJS)
  94         rm -f libbz2.a
  95 -       ar cq libbz2.a $(OBJS)
  96 -       @if ( test -f /usr/bin/ranlib -o -f /bin/ranlib -o \
  97 -               -f /usr/ccs/bin/ranlib ) ; then \
  98 -               echo ranlib libbz2.a ; \
  99 -               ranlib libbz2.a ; \
 100 -       fi
 101 +       i386-mingw32-dllwrap --def libbz2.def --implib libbz2.a -o libbz2.dll $(OBJS)
 102
 103  test: bzip2
 104         @cat words1
 105 @@ -69,7 +64,7 @@
 106         chmod a+r $(PREFIX)/lib/libbz2.a
 107
 108  clean:
 109 -       rm -f *.o libbz2.a bzip2 bzip2recover \
 110 +       rm -f *.o libbz2.dll libbz2.a bzip2.exe bzip2recover.exe \
 111         sample1.rb2 sample2.rb2 sample3.rb2 \
 112         sample1.tst sample2.tst sample3.tst
 113