From 28453c00c25a3210616167538b3192a8fcfb77ca Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 29 Jan 2015 21:31:39 +0000
Subject: Fix rpath-link use.

---
 sysutils/xentools42/distinfo               |  3 +-
 sysutils/xentools42/patches/patch-Rules.mk | 51 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/xentools42/patches/patch-Rules.mk

(limited to 'sysutils/xentools42')

diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo
index 3788ef3da9a..1eb34f9f44a 100644
--- a/sysutils/xentools42/distinfo
+++ b/sysutils/xentools42/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2014/12/08 05:06:52 msaitoh Exp $
+$NetBSD: distinfo,v 1.14 2015/01/29 21:31:39 joerg Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -25,6 +25,7 @@ SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28
 SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571
 SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6
 SHA1 (patch-Makefile) = 37fbcd6d2f0279d4c04c91085b0e7f5611a5b92a
+SHA1 (patch-Rules.mk) = 51a2804e9a2a509a428392c0eb11243884bb7f22
 SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d
 SHA1 (patch-configure) = 7bf4183efb76bded94a9519bf2737fb1240ab0e7
 SHA1 (patch-examples_Makefile) = 8e89fab7817785b32d79ec0cad3a2645c6981f01
diff --git a/sysutils/xentools42/patches/patch-Rules.mk b/sysutils/xentools42/patches/patch-Rules.mk
new file mode 100644
index 00000000000..011192db33f
--- /dev/null
+++ b/sysutils/xentools42/patches/patch-Rules.mk
@@ -0,0 +1,51 @@
+$NetBSD: patch-Rules.mk,v 1.1 2015/01/29 21:31:39 joerg Exp $
+
+--- Rules.mk.orig	2015-01-12 16:53:24.000000000 +0000
++++ Rules.mk
+@@ -21,23 +21,23 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE)
+ 
+ CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+ LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so
+-SHLIB_libxenctrl  = -Wl,-rpath-link=$(XEN_LIBXC)
++SHLIB_libxenctrl  = -Wl,-rpath-link,$(XEN_LIBXC)
+ 
+ CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
+ LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so
+-SHLIB_libxenguest  = -Wl,-rpath-link=L$(XEN_LIBXC)
++SHLIB_libxenguest  = -Wl,-rpath-link,$(XEN_LIBXC)
+ 
+ CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
+ LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore.so
+-SHLIB_libxenstore  = -Wl,-rpath-link=$(XEN_XENSTORE)
++SHLIB_libxenstore  = -Wl,-rpath-link,$(XEN_XENSTORE)
+ 
+ CFLAGS_libxenstat  = -I$(XEN_LIBXENSTAT)
+ LDLIBS_libxenstat  = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat.so
+-SHLIB_libxenstat  = -Wl,-rpath-link=$(XEN_LIBXENSTAT)
++SHLIB_libxenstat  = -Wl,-rpath-link,$(XEN_LIBXENSTAT)
+ 
+ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
+ LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan
+-SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
++SHLIB_libxenvchan  = -Wl,-rpath-link,$(XEN_LIBVCHAN)
+ 
+ ifeq ($(CONFIG_Linux),y)
+ LIBXL_BLKTAP ?= y
+@@ -48,7 +48,7 @@ endif
+ ifeq ($(LIBXL_BLKTAP),y)
+ CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)
+ LDLIBS_libblktapctl = -L$(XEN_BLKTAP2)/control -lblktapctl
+-SHLIB_libblktapctl  = -Wl,-rpath-link=$(XEN_BLKTAP2)/control
++SHLIB_libblktapctl  = -Wl,-rpath-link,$(XEN_BLKTAP2)/control
+ else
+ CFLAGS_libblktapctl =
+ LDLIBS_libblktapctl =
+@@ -57,7 +57,7 @@ endif
+ 
+ CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude)
+ LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight.so $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl)
+-SHLIB_libxenlight  = -Wl,-rpath-link=$(XEN_XENLIGHT)
++SHLIB_libxenlight  = -Wl,-rpath-link,$(XEN_XENLIGHT)
+ 
+ CFLAGS += -D__XEN_TOOLS__
+ 
-- 
cgit v1.2.3