diff options
| author | dsainty <dsainty@pkgsrc.org> | 2006-10-30 10:14:17 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2006-10-30 10:14:17 +0000 |
| commit | 578407c9e4207f187411acfabc2237c52a4d175c (patch) | |
| tree | 392cf55fa45fa300c98c5dd65633df621bd8b006 | |
| parent | fe1dc535e0ab3fd55d890058c8bb4322654d37d2 (diff) | |
| download | pkgsrc-578407c9e4207f187411acfabc2237c52a4d175c.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!
Note: This is the same as x11/xorg-libs/patches/patch-cu
Discussed with joerg@
| -rw-r--r-- | x11/xorg-imake/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorg-imake/patches/patch-al | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo index d2a7ec6a09d..f8c86ee497f 100644 --- a/x11/xorg-imake/distinfo +++ b/x11/xorg-imake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2006/09/25 16:41:39 joerg Exp $ +$NetBSD: distinfo,v 1.23 2006/10/30 10:14:17 dsainty Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -16,3 +16,4 @@ SHA1 (patch-ah) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162 SHA1 (patch-aj) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4 SHA1 (patch-ak) = ea7735f8d160993753b7ecc70dea9585f619cd67 +SHA1 (patch-al) = 99e0ec0a7119ccc8d0df72dec67ee5e4fe0dd5c7 diff --git a/x11/xorg-imake/patches/patch-al b/x11/xorg-imake/patches/patch-al new file mode 100644 index 00000000000..61435a8b8c4 --- /dev/null +++ b/x11/xorg-imake/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.3 2006/10/30 10:14:17 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 |