summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbouyer <bouyer>2011-10-28 11:31:29 +0000
committerbouyer <bouyer>2011-10-28 11:31:29 +0000
commit5e6a8778ebdf8ce8f8bc8970aa5caeed17ace5f7 (patch)
treebc3f1f86606c788065eb9f3d63e59defe0231768
parent876948d909c7df059f910f470123f814fb238153 (diff)
downloadpkgsrc-5e6a8778ebdf8ce8f8bc8970aa5caeed17ace5f7.tar.gz
Do not hardcode /usr/pkg, use $PREFIX
-rw-r--r--sysutils/xentools41/distinfo3
-rw-r--r--sysutils/xentools41/patches/patch-ocaml-include-path13
2 files changed, 15 insertions, 1 deletions
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index 718d7f59159..0845d491405 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/10/26 13:39:48 bouyer Exp $
+$NetBSD: distinfo,v 1.12 2011/10/28 11:31:29 bouyer Exp $
SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -34,5 +34,6 @@ SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d
SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e
SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3
SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d
+SHA1 (patch-ocaml-include-path) = 959df25b0aae78d525b25f223190203d3c1185a6
SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5
SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7
diff --git a/sysutils/xentools41/patches/patch-ocaml-include-path b/sysutils/xentools41/patches/patch-ocaml-include-path
new file mode 100644
index 00000000000..68c6569b80b
--- /dev/null
+++ b/sysutils/xentools41/patches/patch-ocaml-include-path
@@ -0,0 +1,13 @@
+$NetBSD: patch-ocaml-include-path,v 1.1 2011/10/28 11:31:30 bouyer Exp $
+
+--- ocaml/common.make.orig 2011-10-28 13:22:47.000000000 +0200
++++ ocaml/common.make 2011-10-28 13:23:28.000000000 +0200
+@@ -11,7 +11,7 @@
+ CFLAGS += -fPIC -Werror
+ CFLAGS += -I$(TOPLEVEL)/../include -I$(TOPLEVEL)/../libxc -I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl
+ CFLAGS-$(CONFIG_Linux) += -I$(shell ocamlc -where)
+-CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
++CFLAGS-$(CONFIG_NetBSD) += -I$(PREFIX)/lib/ocaml -fPIC
+
+ OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/\1/p')
+ OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F