[pkgsrc/trunk]: pkgsrc/x11/xorg-libs Run-time path fix for Solaris for the X ...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ddfc7726fa9
branches:  trunk
changeset: 520810:9ddfc7726fa9
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Mon Oct 30 09:33:32 2006 +0000

description:
Run-time path fix for Solaris for the X client libraries.  Without this
patch, libraries such as libXext.so will not contain a run-time link path
to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
with other (non-Pkgsrc) X libraries on the system!

Discussed with joerg@

diffstat:

 x11/xorg-libs/distinfo         |   3 ++-
 x11/xorg-libs/patches/patch-cu |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r e347739234a2 -r 9ddfc7726fa9 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Mon Oct 30 08:03:39 2006 +0000
+++ b/x11/xorg-libs/distinfo    Mon Oct 30 09:33:32 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2006/09/16 15:29:36 hira Exp $
+$NetBSD: distinfo,v 1.56 2006/10/30 09:33:32 dsainty Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -73,3 +73,4 @@
 SHA1 (patch-cr) = c613afdca92b36a1a34264a53f9eaf4a8276a5fa
 SHA1 (patch-cs) = 686c444c42acbbae4030ff198bcd4fbd08e7a0e3
 SHA1 (patch-ct) = 96084456c2d7d4aaf05b2eebd13be2e575cead29
+SHA1 (patch-cu) = 99e0ec0a7119ccc8d0df72dec67ee5e4fe0dd5c7
diff -r e347739234a2 -r 9ddfc7726fa9 x11/xorg-libs/patches/patch-cu
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/patches/patch-cu    Mon Oct 30 09:33:32 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-cu,v 1.1 2006/10/30 09:33:32 dsainty Exp $
+
+Run-time path fix for Solaris for the X client libraries.  Without this
+patch, libraries such as libXext.so will not contain a run-time link path
+to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
+with other (non-Pkgsrc) X libraries on the system!
+
+--- config/cf/sun.cf.orig      2005-12-04 06:20:48.000000000 +1300
++++ config/cf/sun.cf   2006-10-26 13:11:56.535497000 +1300
+@@ -688,10 +688,10 @@
+     /* This is to work around what appears to be a PIC bug in some gcc/egcs
+        versions that shows up with the Solaris 7/x86 <ctype.h>. */
+ #    define SharedLibraryLdCmd $(LD)
+-#    define SharedLibraryLoadFlags -G -z textwarn
++#    define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags
+ #   else
+ #    define SharedLibraryLdCmd $(CC)
+-#    define SharedLibraryLoadFlags -shared -z text
++#    define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags
+ #   endif
+ #  endif
+ # else