diff options
| author | veego <veego> | 2005-02-24 06:24:03 +0000 |
|---|---|---|
| committer | veego <veego> | 2005-02-24 06:24:03 +0000 |
| commit | 3b28e4220d2eda0fae708fc7cba6b4482d86b7f5 (patch) | |
| tree | 7197a031d8040cfb5b4a90f509f34439419e3e52 /graphics/MesaLib | |
| parent | 5c8d89b1380dca61a86da64cedfca8533ce2c404 (diff) | |
| download | pkgsrc-3b28e4220d2eda0fae708fc7cba6b4482d86b7f5.tar.gz | |
Fix the last commit which didn't record the correct rpath for the X11
libraries due too the usage of two -rpath options for libtool:
libtool: link: warning: ignoring multiple `-rpath's for a libtool library
According to the gnu libtool page you have to use -R:
-R libdir
If output-file is a program, add libdir to its run-time path. If
output-file is a library, add -Rlibdir to its dependency_libs, so
that, whenever the library is linked into a program, libdir will be
added to its run-time path.
Diffstat (limited to 'graphics/MesaLib')
| -rw-r--r-- | graphics/MesaLib/distinfo | 4 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-ag | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index a637fc6ae16..1948a6061a7 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2005/02/23 13:57:35 grant Exp $ +$NetBSD: distinfo,v 1.24 2005/02/24 06:24:03 veego Exp $ SHA1 (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 7c4fb46ae17b066e85e90592ace496ac6b36c189 Size (Mesa-6.2.1/MesaLib-6.2.1.tar.bz2) = 1627520 bytes @@ -10,5 +10,5 @@ SHA1 (patch-ac) = 9a0717105fef41e84b5faebaa8bd91d1c0964b86 SHA1 (patch-ad) = 0d8bee8806d2c5c23acf2bf4744f64efc1c73d7d SHA1 (patch-ae) = b7fd3c2af1e40536f9e5a2b0409342aaee7fef1f SHA1 (patch-af) = fce796cba87fb5f1bab32bfd095dcb1d4320fdc8 -SHA1 (patch-ag) = 696fc3000edbfdba41dd4ebc48b1384e1fda4d04 +SHA1 (patch-ag) = 53723bb74760a43b2ff21f154886b0a6b450058c SHA1 (patch-ah) = 8ccfd1734accf9ed3920d42e9208eef5a9d233cf diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag index 41367cdf199..2b61e0e6814 100644 --- a/graphics/MesaLib/patches/patch-ag +++ b/graphics/MesaLib/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.5 2005/02/23 13:57:35 grant Exp $ +$NetBSD: patch-ag,v 1.6 2005/02/24 06:24:03 veego Exp $ --- src/glut/glx/Makefile.orig 2004-12-06 05:00:20.000000000 +1100 +++ src/glut/glx/Makefile @@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.5 2005/02/23 13:57:35 grant Exp $ - $(GLUT_LIB_DEPS) $(OBJECTS) + ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib \ -+ -L${X11BASE}/lib -rpath ${X11BASE}/lib -lXi \ ++ -L${X11BASE}/lib -R ${X11BASE}/lib -lXi \ + -version-info ${GLUT_MAJOR}:${GLUT_MINOR} |