diff --git a/archivers/bzip2/files/patch b/archivers/bzip2/files/patch index d4b8c138628..269cc4875dd 100644 --- a/archivers/bzip2/files/patch +++ b/archivers/bzip2/files/patch @@ -1,42 +1,46 @@ ---- Makefile.orig2 Sat May 8 21:26:10 1999 -+++ Makefile Sat May 8 21:27:11 1999 -@@ -10,11 +10,9 @@ +--- Makefile.orig2 Wed Aug 11 09:14:41 1999 ++++ Makefile Wed Aug 11 09:16:31 1999 +@@ -11,11 +11,9 @@ decompress.o \ bzlib.o -.SUFFIXES: .c .so .o -+all: lib bzip2 ++all: libbz2.a bzip2 bzip2recover --all: lib lib.so.${VER} bzip2 +-all: libbz2.a libbz2.so.${VER} bzip2 bzip2recover - --bzip2: lib lib.so.${VER} -+bzip2: lib - $(CC) $(CFLAGS) -c bzip2.c +-bzip2: libbz2.a libbz2.so.${VER} bzip2.o ++bzip2: libbz2.a bzip2.o $(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2 - $(CC) $(CFLAGS) -o bzip2recover bzip2recover.c -@@ -24,10 +22,6 @@ - ar clq libbz2.a $(OBJS) - ranlib libbz2.a --lib.so.${VER}: $(OBJS:S/o$/so/g) + bzip2recover: bzip2recover.o +@@ -30,10 +28,6 @@ + ranlib libbz2.a ; \ + fi + +-libbz2.so.${VER}: $(OBJS:S/o$/so/g) - rm -f libbz2.so.${VER} -- ld -Bshareable -o libbz2.so.${VER} $(OBJS:S/o$/so/g) +- ld -Bshareable -Bforcearchive -o libbz2.so.${VER} $(OBJS:S/o$/so/g) - test: bzip2 @cat words1 - ./bzip2 -1 < sample1.ref > sample1.rb2 -@@ -42,13 +36,10 @@ - @cat words3 + ./bzip2 -1 < sample1.ref > sample1.rb2 +@@ -72,7 +66,7 @@ + chmod a+r $(PREFIX)/lib/libbz2.a clean: -- rm -f *.o *.so libbz2.a libbz2.so.${VER} bzip2 bzip2recover sample1.rb2 sample2.rb2 sample1.tst sample2.tst -+ rm -f *.o libbz2.a bzip2 bzip2recover sample1.rb2 sample2.rb2 sample1.tst sample2.tst +- rm -f *.o *.so libbz2.a libbz2.so.${VER} bzip2 bzip2recover \ ++ rm -f *.o libbz2.a bzip2 bzip2recover \ + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst - .c.o: bzlib.h bzlib_private.h - $(CC) $(CFLAGS) -c $*.c -o $*.o +@@ -94,9 +88,6 @@ + $(CC) $(CFLAGS) -c bzip2.c + bzip2recover.o: bzip2recover.c + $(CC) $(CFLAGS) -c bzip2recover.c - -.c.so: -- $(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so +- $(CC) -fpic -DPIC $(CFLAGS) -c $*.c -o $*.so tarfile: - tar cvf interim.tar *.c *.h Makefile manual.texi manual.ps LICENSE bzip2.1 bzip2.1.preformatted bzip2.txt words1 words2 words3 sample1.ref sample2.ref sample1.bz2 sample2.bz2 *.html README CHANGES libbz2.def libbz2.dsp dlltest.dsp + tar cvf interim.tar blocksort.c huffman.c crctable.c \