From 9f929ff58bffb54784fe0769c0ab1052492de7cd Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Thu, 22 Jan 2004 12:25:59 +0000
Subject: move linker arguments around so that always ${LDFLAGS} comes before
 -lz, ensuring we only link against pkgsrc libz.

fixes a problem on Solaris where the linker would find and use
/usr/lib/libz.so *and* ${LOCALBASE}/lib/libz.so which fails at
runtime because the versions differ.
---
 archivers/unzip/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'archivers/unzip/Makefile')

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 19015747e00..0204fb31330 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2004/01/20 12:07:07 agc Exp $
+# $NetBSD: Makefile,v 1.46 2004/01/22 12:25:59 grant Exp $
 
 DISTNAME=	unzip550
 PKGNAME=	unzip-5.50
@@ -27,9 +27,9 @@ USE_BUILDLINK3=	yes
 MAKEFILE=	unix/Makefile
 ALL_TARGET=	generic_zlib unzipsfx
 .if ${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin"
-MAKE_FLAGS=	CF="${CFLAGS} -I. -DBSD -DUNIX -Dunix -DUSE_UNSHRINK" LF2="-lz ${_STRIPFLAG_CC} ${LDFLAGS}"
+MAKE_FLAGS=	CF="${CFLAGS} -I. -DBSD -DUNIX -Dunix -DUSE_UNSHRINK" LF2="${_STRIPFLAG_CC} ${LDFLAGS} -lz"
 .else
-MAKE_FLAGS=	CF="${CFLAGS} -I. -DUNIX -Dunix -DUSE_UNSHRINK" LF2="-lz ${_STRIPFLAG_CC} ${LDFLAGS}"
+MAKE_FLAGS=	CF="${CFLAGS} -I. -DUNIX -Dunix -DUSE_UNSHRINK" LF2="${_STRIPFLAG_CC} ${LDFLAGS} -lz"
 .endif
 
 INSTALLATION_DIRS=	bin man/man1 share/doc
-- 
cgit v1.2.3