diff options
author | grant <grant> | 2004-01-22 12:25:59 +0000 |
---|---|---|
committer | grant <grant> | 2004-01-22 12:25:59 +0000 |
commit | 9f929ff58bffb54784fe0769c0ab1052492de7cd (patch) | |
tree | 5c2d46903fc5a10fc7f69d7c38d6fba87b8c9edf /archivers/unzip/Makefile | |
parent | 45866cf0c507654c13cc1b2d74417ef54de3dfbd (diff) | |
download | pkgsrc-9f929ff58bffb54784fe0769c0ab1052492de7cd.tar.gz |
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.
Diffstat (limited to 'archivers/unzip/Makefile')
-rw-r--r-- | archivers/unzip/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
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 |