diff options
| author | wiz <wiz@pkgsrc.org> | 2003-09-18 18:46:28 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-09-18 18:46:28 +0000 |
| commit | d03ebc6a3a0cef471241d7aae135ec66d943b7c6 (patch) | |
| tree | 0744176d538c7f2de946b3ad911f5805073274c4 /archivers/bzip2 | |
| parent | f1d9fbec91c32f24753fc7a2c5a1f8362ab72e2b (diff) | |
| download | pkgsrc-d03ebc6a3a0cef471241d7aae135ec66d943b7c6.tar.gz | |
Use libtool with correct --mode argument. From Ron Roskens in PR 22824.
Diffstat (limited to 'archivers/bzip2')
| -rw-r--r-- | archivers/bzip2/Makefile | 4 | ||||
| -rw-r--r-- | archivers/bzip2/distinfo | 4 | ||||
| -rw-r--r-- | archivers/bzip2/patches/patch-aa | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 2f6445569a3..b7b178b045e 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/07/17 21:21:07 grant Exp $ +# $NetBSD: Makefile,v 1.25 2003/09/18 18:46:28 wiz Exp $ # DISTNAME= bzip2-1.0.2 @@ -34,6 +34,6 @@ do-install: ${LN} -s ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzcat.1 ${LN} -s ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bzip2recover.1 ${INSTALL_DATA} ${WRKSRC}/bzlib.h ${PREFIX}/include - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib + ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib .include "../../mk/bsd.pkg.mk" diff --git a/archivers/bzip2/distinfo b/archivers/bzip2/distinfo index 997962a0942..faedfb18f3e 100644 --- a/archivers/bzip2/distinfo +++ b/archivers/bzip2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2003/03/18 21:53:29 jschauma Exp $ +$NetBSD: distinfo,v 1.8 2003/09/18 18:46:30 wiz Exp $ SHA1 (bzip2-1.0.2.tar.gz) = d47793959c0d65a4d7246e0247ed1358662d9ebf Size (bzip2-1.0.2.tar.gz) = 665198 bytes -SHA1 (patch-aa) = 96899bad1878fbd0c556c0830d8a7a71ce724fc9 +SHA1 (patch-aa) = d902ac2a23f0b6f1b057f0e3637a06e844b9360b diff --git a/archivers/bzip2/patches/patch-aa b/archivers/bzip2/patches/patch-aa index 2ee6609cc50..72312970a26 100644 --- a/archivers/bzip2/patches/patch-aa +++ b/archivers/bzip2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2003/03/18 21:53:30 jschauma Exp $ +$NetBSD: patch-aa,v 1.7 2003/09/18 18:46:32 wiz Exp $ --- Makefile.orig Sat Jan 26 00:34:53 2002 +++ Makefile Sun Mar 24 14:56:33 2002 @@ -7,8 +7,8 @@ $NetBSD: patch-aa,v 1.6 2003/03/18 21:53:30 jschauma Exp $ # To assist in cross-compiling -CC=gcc -+CC=${LIBTOOL} ${REALCC} -+LD=${LIBTOOL} ${REALCC} ++CC=${LIBTOOL} --mode=compile ${REALCC} ++LD=${LIBTOOL} --mode=link ${REALCC} AR=ar RANLIB=ranlib -LDFLAGS= @@ -35,11 +35,11 @@ $NetBSD: patch-aa,v 1.6 2003/03/18 21:53:30 jschauma Exp $ -bzip2: libbz2.a bzip2.o - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 +bzip2: libbz2.la bzip2.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la ++ $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2 bzip2.o libbz2.la bzip2recover: bzip2recover.o - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o ++ $(LD) $(CFLAGS) $(LDFLAGS) -static -o bzip2recover bzip2recover.o -libbz2.a: $(OBJS) - rm -f libbz2.a |