From 0919d8ce0a3031e33c804ac71495e049bf05420d Mon Sep 17 00:00:00 2001 From: obache Date: Fri, 4 May 2012 11:38:20 +0000 Subject: Set RPATH to X11BASE/lib for OpenBSD too. --- x11/xorg-cf-files/distinfo | 3 ++- x11/xorg-cf-files/patches/patch-OpenBSDLib.rules | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 x11/xorg-cf-files/patches/patch-OpenBSDLib.rules (limited to 'x11/xorg-cf-files') diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo index e627c4dd154..e5779d63145 100644 --- a/x11/xorg-cf-files/distinfo +++ b/x11/xorg-cf-files/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.14 2012/04/12 14:01:17 hans Exp $ +$NetBSD: distinfo,v 1.15 2012/05/04 11:38:20 obache Exp $ SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45 RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes +SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927 SHA1 (patch-X11.rules) = 13fee315aced521bef608e9341fc72526341bb1f SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3 diff --git a/x11/xorg-cf-files/patches/patch-OpenBSDLib.rules b/x11/xorg-cf-files/patches/patch-OpenBSDLib.rules new file mode 100644 index 00000000000..de5c99f7587 --- /dev/null +++ b/x11/xorg-cf-files/patches/patch-OpenBSDLib.rules @@ -0,0 +1,17 @@ +$NetBSD: patch-OpenBSDLib.rules,v 1.1 2012/05/04 11:38:20 obache Exp $ + +--- OpenBSDLib.rules.orig 2009-10-16 21:45:42.000000000 +0000 ++++ OpenBSDLib.rules +@@ -42,7 +42,11 @@ XCOMM $XFree86: xc/config/cf/OpenBSDLib. + #endif + #ifndef RpathLoadFlags + #if UseRpath +-#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) ++# ifdef RealProjectRoot ++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath,$(REALPROJECTROOT)/lib -L $(REALPROJECTROOT)/lib ++# else ++# define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) ++# endif + #else + #define RpathLoadFlags /**/ + #endif -- cgit v1.2.3