diff options
| author | grant <grant> | 2004-01-22 12:25:59 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-01-22 12:25:59 +0000 |
| commit | f073063b61be28d9f29b22565f1182a9bc299e92 (patch) | |
| tree | 5c2d46903fc5a10fc7f69d7c38d6fba87b8c9edf /archivers | |
| parent | a7fea6b989ee206ea55c13943bb092c2de307988 (diff) | |
| download | pkgsrc-f073063b61be28d9f29b22565f1182a9bc299e92.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')
| -rw-r--r-- | archivers/unzip/Makefile | 6 | ||||
| -rw-r--r-- | archivers/unzip/distinfo | 4 | ||||
| -rw-r--r-- | archivers/unzip/patches/patch-ab | 17 |
3 files changed, 18 insertions, 9 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 diff --git a/archivers/unzip/distinfo b/archivers/unzip/distinfo index 603cb63db39..c8cee104880 100644 --- a/archivers/unzip/distinfo +++ b/archivers/unzip/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2003/08/26 13:02:15 tron Exp $ +$NetBSD: distinfo,v 1.9 2004/01/22 12:25:59 grant Exp $ SHA1 (unzip550.tar.gz) = 51034a8098eddc8facb4db9ea1a935e813dbdb73 Size (unzip550.tar.gz) = 1068662 bytes SHA1 (unzip_5.50-1woody2.diff.gz) = 2988b7954203f9e192e2cdbf590673c6ba986296 Size (unzip_5.50-1woody2.diff.gz) = 5049 bytes SHA1 (patch-aa) = a90ed5bb96f5b1c1be4ef5ddc952edb364fa7a05 -SHA1 (patch-ab) = 17be71eb0c670f20d0872c215fbadf637b471b96 +SHA1 (patch-ab) = dd426fdf4b774bd73f4ee46da470ffa3c2cf6513 diff --git a/archivers/unzip/patches/patch-ab b/archivers/unzip/patches/patch-ab index d25022194ab..494b398008d 100644 --- a/archivers/unzip/patches/patch-ab +++ b/archivers/unzip/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 2002/08/25 21:49:26 jlam Exp $ +$NetBSD: patch-ab,v 1.5 2004/01/22 12:25:59 grant Exp $ ---- unix/Makefile.orig Sun Feb 17 04:00:38 2002 -+++ unix/Makefile Wed Jul 17 04:50:03 2002 +--- unix/Makefile.orig 2002-02-17 04:00:38.000000000 +1100 ++++ unix/Makefile @@ -42,7 +42,7 @@ # such as -DDOSWILD). @@ -11,7 +11,16 @@ $NetBSD: patch-ab,v 1.4 2002/08/25 21:49:26 jlam Exp $ LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) AS = as LOC = $(LOCAL_UNZIP) -@@ -613,7 +613,7 @@ +@@ -552,7 +552,7 @@ generic3: unix_make # third try if unkn + generic_zlib: unix_make + @echo\ + "This target assumes zlib (libz.a or libz.so.*) is already installed." +- $(MAKE) unzip funzip CF="$(CF) -DUSE_ZLIB" LF2="-lz $(LF2)" ++ $(MAKE) unzip funzip CF="$(CF) -DUSE_ZLIB" LF2="$(LF2)" + + # Generic GNU C shared library. This is an example of how to compile UnZip as + # a shared library. (Doing so as a static library would be similar.) See also +@@ -613,7 +613,7 @@ vax: unzips # general-purpose VAX targe bsd: _bsd # generic BSD (BSD 4.2 & Ultrix handled in unzip.h) _bsd: unix_make |