diff options
author | jperkin <jperkin> | 2014-07-25 14:02:12 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2014-07-25 14:02:12 +0000 |
commit | 0ec9d14c078be808a9162faca94584d4352994c7 (patch) | |
tree | 11c71e13353ac151f644dcab350836cc27515105 | |
parent | 0e192077f7a470c4f1c666d3d7748181be07e6dd (diff) | |
download | pkgsrc-0ec9d14c078be808a9162faca94584d4352994c7.tar.gz |
Ensure a LOCALBASE rpath is added to all binaries on SunOS, not just
libraries. Fixes a large number of check-shlibs-elf.awk failures.
Bump PKGREVISION.
-rw-r--r-- | x11/xorg-cf-files/Makefile | 4 | ||||
-rw-r--r-- | x11/xorg-cf-files/distinfo | 4 | ||||
-rw-r--r-- | x11/xorg-cf-files/patches/patch-af | 36 |
3 files changed, 18 insertions, 26 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index d1b33743bdc..f9f3f4fa446 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2013/08/15 08:15:04 jperkin Exp $ +# $NetBSD: Makefile,v 1.27 2014/07/25 14:02:12 jperkin Exp $ DISTNAME= xorg-cf-files-1.0.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo index d304e84b5c3..5495ff1a008 100644 --- a/x11/xorg-cf-files/distinfo +++ b/x11/xorg-cf-files/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2013/08/15 08:15:04 jperkin Exp $ +$NetBSD: distinfo,v 1.21 2014/07/25 14:02:12 jperkin Exp $ SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e @@ -11,7 +11,7 @@ SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280 SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2 -SHA1 (patch-af) = 554586a02da2bd6d16658c82152d4f9ab21be448 +SHA1 (patch-af) = acabf322a71f98ec04dda6c10c1732939332e1ea SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449 diff --git a/x11/xorg-cf-files/patches/patch-af b/x11/xorg-cf-files/patches/patch-af index ef7df30283e..8e1380ff583 100644 --- a/x11/xorg-cf-files/patches/patch-af +++ b/x11/xorg-cf-files/patches/patch-af @@ -1,13 +1,8 @@ -$NetBSD: patch-af,v 1.6 2013/08/15 08:15:04 jperkin Exp $ +$NetBSD: patch-af,v 1.7 2014/07/25 14:02:12 jperkin 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! - -Disable Solaris64bitSubdir, at least until multi-arch is supported. - -Use pkgsrc CC, CXX, CFLAGS and INSTALL. +- Ensure all programs and libraries have a LOCALBASE rpath. +- Disable Solaris64bitSubdir, at least until multi-arch is supported. +- Use pkgsrc CC, CXX, CFLAGS and INSTALL. --- sun.cf.orig 2013-07-23 05:23:14.000000000 +0000 +++ sun.cf @@ -23,7 +18,7 @@ Use pkgsrc CC, CXX, CFLAGS and INSTALL. # endif #ifndef LargefileDefines # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) -@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV +@@ -682,19 +682,19 @@ XCOMM SunPro C++ CplusplusCompilerMajorV # endif # if HasGcc2 # ifndef CcCmd @@ -51,18 +46,15 @@ Use pkgsrc CC, CXX, CFLAGS and INSTALL. # endif # if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd) # if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture) - /* 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 +@@ -836,7 +836,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV + MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack + /* ExtraLoadFlags apply to all binaries - programs & libraries */ + # ifndef ExtraLoadFlags +-# define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL) ++# define ExtraLoadFlags RpathLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL) + # endif + /* ExtraLoadOptions only apply to programs */ + # ifndef ExtraLoadOptions @@ -853,7 +853,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma # endif #endif |