diff options
author | dsainty <dsainty@pkgsrc.org> | 2006-10-30 09:33:32 +0000 |
---|---|---|
committer | dsainty <dsainty@pkgsrc.org> | 2006-10-30 09:33:32 +0000 |
commit | 56ed90d8fc673ca6b0849ce604da704557e0cf76 (patch) | |
tree | e28a9f9a9841b687d09cd6bcfe7cce9ac772b21c /x11/xorg-libs | |
parent | 52438dcb950ab95da201a6c9756a1294b6781158 (diff) | |
download | pkgsrc-56ed90d8fc673ca6b0849ce604da704557e0cf76.tar.gz |
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 (limited to 'x11/xorg-libs')
-rw-r--r-- | x11/xorg-libs/distinfo | 3 | ||||
-rw-r--r-- | x11/xorg-libs/patches/patch-cu | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index ae01b6bfb05..3a71b45448c 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -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-cq) = ea8659818ffec0db8a1d11a2a45c3cdcce8b85bc SHA1 (patch-cr) = c613afdca92b36a1a34264a53f9eaf4a8276a5fa SHA1 (patch-cs) = 686c444c42acbbae4030ff198bcd4fbd08e7a0e3 SHA1 (patch-ct) = 96084456c2d7d4aaf05b2eebd13be2e575cead29 +SHA1 (patch-cu) = 99e0ec0a7119ccc8d0df72dec67ee5e4fe0dd5c7 diff --git a/x11/xorg-libs/patches/patch-cu b/x11/xorg-libs/patches/patch-cu new file mode 100644 index 00000000000..f0bdb6991c5 --- /dev/null +++ b/x11/xorg-libs/patches/patch-cu @@ -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 |