diff options
| author | tron <tron> | 1999-04-23 21:41:25 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-04-23 21:41:25 +0000 |
| commit | 1895b46fa59a5b3b5167885ce2e7fc6c8ca40969 (patch) | |
| tree | e0f96eef90348aa790fed04b1ec073e5ff86c511 | |
| parent | 1701a41fa3887b8a86486fb6020aea1568b9fa1f (diff) | |
| download | pkgsrc-1895b46fa59a5b3b5167885ce2e7fc6c8ca40969.tar.gz | |
Fix run time library search path.
| -rw-r--r-- | graphics/ImageMagick/patches/patch-aa | 10 | ||||
| -rw-r--r-- | news/knews/patches/patch-ab | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 4a30846364d..6075ec1ee6d 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.8 1999/04/05 01:11:58 tron Exp $ +$NetBSD: patch-aa,v 1.9 1999/04/23 21:41:25 tron Exp $ --- Magick.tmpl.orig Wed Mar 31 16:36:48 1999 -+++ Magick.tmpl Mon Apr 5 02:57:35 1999 ++++ Magick.tmpl Fri Apr 23 23:32:58 1999 @@ -37,17 +37,17 @@ #ifdef RsArchitecture XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.8 1999/04/05 01:11:58 tron Exp $ -JPEG_INCLUDES= -I$(TOP)/jpeg -JPEG_FLAGS= -L$(TOP)/jpeg +JPEG_INCLUDES= -I${LOCALBASE}/include -+JPEG_FLAGS= -L${LOCALBASE}/lib ++JPEG_FLAGS= -L${LOCALBASE}/lib -R${LOCALBASE}/lib JPEG_LIBRARIES= -ljpeg #endif @@ -62,7 +62,7 @@ $NetBSD: patch-aa,v 1.8 1999/04/05 01:11:58 tron Exp $ -PNG_INCLUDES= -I$(TOP)/png -PNG_FLAGS= -L$(TOP)/png +PNG_INCLUDES= -I${LOCALBASE}/include -+PNG_FLAGS= -L${LOCALBASE}/lib ++PNG_FLAGS= -L${LOCALBASE}/lib -R${LOCALBASE}/lib PNG_LIBRARIES= -lpng #endif @@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.8 1999/04/05 01:11:58 tron Exp $ -TIFF_INCLUDES= -I$(TOP)/tiff/libtiff -TIFF_FLAGS= -L$(TOP)/tiff/libtiff +TIFF_INCLUDES= -I${LOCALBASE}/include -+TIFF_FLAGS= -L${LOCALBASE}/lib ++TIFF_FLAGS= -L${LOCALBASE}/lib -R${LOCALBASE}/lib TIFF_LIBRARIES= -ltiff #endif diff --git a/news/knews/patches/patch-ab b/news/knews/patches/patch-ab index bf592c6ec47..df5cde249f2 100644 --- a/news/knews/patches/patch-ab +++ b/news/knews/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 1999/03/14 15:07:21 tron Exp $ +$NetBSD: patch-ab,v 1.5 1999/04/23 21:47:13 tron Exp $ --- knews.tmpl.orig Tue Dec 29 05:14:55 1998 +++ knews.tmpl Tue Mar 9 06:30:33 1999 @@ -25,11 +25,9 @@ $NetBSD: patch-ab,v 1.4 1999/03/14 15:07:21 tron Exp $ */ -JPEG_LIB = -ljpeg --PNG_LIB = -lpng -lz -lm --COMPFACE_LIB = -lcompface -+JPEG_LIB = -L${LOCALBASE}/lib -ljpeg -+PNG_LIB = -L${LOCALBASE}/lib -lpng -lz -lm -+COMPFACE_LIB = -L${LOCALBASE}/lib -lcompface ++JPEG_LIB = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg + PNG_LIB = -lpng -lz -lm + COMPFACE_LIB = -lcompface /* |