diff options
| author | joerg <joerg> | 2008-01-25 18:55:02 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-01-25 18:55:02 +0000 |
| commit | 531b67a367513673c72fd4345ba7d08466b24564 (patch) | |
| tree | 75127e0eca5050b2b65a068434a3ded9653dc7c7 /x11 | |
| parent | e0b2305e429f4ddea35c1005240564e9d9806293 (diff) | |
| download | pkgsrc-531b67a367513673c72fd4345ba7d08466b24564.tar.gz | |
Fix rpath usage on Linux.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-cf-files/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-cf-files/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorg-cf-files/patches/patch-aj | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 187d54665b4..1296ca98faa 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2008/01/12 21:19:34 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2008/01/25 18:55:02 joerg Exp $ # DISTNAME= xorg-cf-files-1.0.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 devel MASTER_SITES= http://xorg.freedesktop.org/releases/individual/util/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo index 0d65777c5ea..141bb6cc1c1 100644 --- a/x11/xorg-cf-files/distinfo +++ b/x11/xorg-cf-files/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2008/01/12 21:57:04 joerg Exp $ +$NetBSD: distinfo,v 1.5 2008/01/25 18:55:02 joerg Exp $ SHA1 (xorg-cf-files-1.0.2.tar.bz2) = a1182e1fd05a648e6282598a355b7c4be9339755 RMD160 (xorg-cf-files-1.0.2.tar.bz2) = dc42aa06d7fb5bc073d51958763bf1bfcfd22926 @@ -12,3 +12,4 @@ SHA1 (patch-af) = 6fdcbcb8858bd82d260d00563980e80e314b899c SHA1 (patch-ag) = f2e665cc6e67cf2f687652b9adeab0a0de816729 SHA1 (patch-ah) = f329f44a81c49ba66e8da197ab99a53172a1d247 SHA1 (patch-ai) = a0795dcd3442471a58c77c667b3eeb50d7bb47bb +SHA1 (patch-aj) = 5060968a789b0cf2568e4b3eb71d9e988d7f3d9e diff --git a/x11/xorg-cf-files/patches/patch-aj b/x11/xorg-cf-files/patches/patch-aj new file mode 100644 index 00000000000..186f26f953e --- /dev/null +++ b/x11/xorg-cf-files/patches/patch-aj @@ -0,0 +1,34 @@ +$NetBSD: patch-aj,v 1.1 2008/01/25 18:55:02 joerg Exp $ + +Force Rpath usage on Linux. For reasons analysed in details, +the binutils detection seems to fail. + +--- lnxLib.rules.orig 2004-04-23 20:41:58.000000000 +0200 ++++ lnxLib.rules +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule + #endif + + #ifndef UseRpath +-#define UseRpath NO ++#define UseRpath YES + #endif + + #ifndef SharedOldX +@@ -87,17 +87,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rule + # define PositionIndependentCplusplusFlags -fPIC + # endif + # ifndef ExtraLoadFlags +-# if LinuxBinUtilsMajorVersion >= 26 +-# ifdef UseInstalled +-# if LinuxBinUtilsMajorVersion < 27 +-# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH) +-# endif +-# else + # define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) +-# endif +-# else +-# define ExtraLoadFlags RpathLoadFlags +-# endif + # endif + # ifndef HardCodeLibdirFlag + # define HardCodeLibdirFlag RpathLoadFlags |