diff options
| author | jlam <jlam> | 2001-06-21 22:36:54 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-21 22:36:54 +0000 |
| commit | cfce5ebb85ffa5d0dc9d06c0d2291f92a30eca01 (patch) | |
| tree | b47b999c66fd5c0540ae5824ffd35819fe52856f /archivers/bzip2/patches | |
| parent | 0bd123e127ea4ab8a3da323a1114dd66a4a26384 (diff) | |
| download | pkgsrc-cfce5ebb85ffa5d0dc9d06c0d2291f92a30eca01.tar.gz | |
Install the headers and libraries for bzip2, and add a buildlink.mk file
for use by other package Makefiles.
Diffstat (limited to 'archivers/bzip2/patches')
| -rw-r--r-- | archivers/bzip2/patches/patch-aa | 52 |
1 files changed, 44 insertions, 8 deletions
diff --git a/archivers/bzip2/patches/patch-aa b/archivers/bzip2/patches/patch-aa index b7b384ae40e..5e2c0c00b34 100644 --- a/archivers/bzip2/patches/patch-aa +++ b/archivers/bzip2/patches/patch-aa @@ -1,17 +1,53 @@ -$NetBSD: patch-aa,v 1.2 2001/06/10 01:14:59 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/21 22:36:55 jlam Exp $ ---- Makefile.orig Fri Jun 23 22:34:47 2000 +--- Makefile.orig Fri Jun 23 16:34:47 2000 +++ Makefile -@@ -15,10 +15,10 @@ - all: libbz2.a bzip2 bzip2recover test +@@ -1,6 +1,7 @@ - bzip2: libbz2.a bzip2.o + SHELL=/bin/sh +-CC=gcc ++CC=${LIBTOOL} ${REALCC} ++LD=${LIBTOOL} ${REALCC} + BIGFILES=-D_FILE_OFFSET_BITS=64 + CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) + +@@ -12,22 +13,18 @@ + decompress.o \ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++all: libbz2.la bzip2 bzip2recover test + +-bzip2: libbz2.a bzip2.o - $(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2 -+ $(CC) $(CFLAGS) -static -o bzip2 bzip2.o -L. -lbz2 ++bzip2: libbz2.la bzip2.o ++ $(CC) $(CFLAGS) -static -o bzip2 bzip2.o libbz2.la bzip2recover: bzip2recover.o - $(CC) $(CFLAGS) -o bzip2recover bzip2recover.o + $(CC) $(CFLAGS) -static -o bzip2recover bzip2recover.o - libbz2.a: $(OBJS) - rm -f libbz2.a +-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 ++libbz2.la: $(OBJS) ++ rm -f libbz2.la ++ $(LD) $(LDFLAGS) -o libbz2.la $(OBJS:.o=.lo) -version-info 0:0 \ ++ -rpath $(PREFIX)/lib + + test: bzip2 + @cat words1 +@@ -44,8 +41,6 @@ + cmp sample2.tst sample2.ref + cmp sample3.tst sample3.ref + @cat words3 +- +-PREFIX=/usr + + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi |