Re: xentools41 LDFLAGS

[Ignatios Souvatzis <is%netbsd.org@localhost>]

On Thu, Mar 14, 2013 at 09:32:29AM -0700, Jeff Rizzo wrote:
> On 3/13/13 6:43 AM, Ignatios Souvatzis wrote:
> >On Tue, Mar 12, 2013 at 01:08:57PM +0100, Ignatios Souvatzis wrote:
> >

[rpath handling patch to ocamlmklib]

> >May I commit?
> 
> Please do!

With this, the rpath handling in xentools41 works if patched thusly:

I intend to commit this soon.

        -is

? fistinfo
? listinfo
? patch-fix-caml-rpath
? patch-fix-caml-rpath-really
? patch-ocaml_common.make
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools41/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile    20 Jan 2013 15:21:54 -0000      1.28
+++ Makefile    14 Mar 2013 19:45:16 -0000
@@ -27,6 +27,9 @@
 BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
 .endif
 
+# for patched ocamlmklib:
+BUILD_DEPENDS+=                ocaml>=4.0.1nb2:../../lang/ocaml
+
 PKG_SYSCONFSUBDIR=     xen
 
 ONLY_FOR_PLATFORM=     Linux-2.6*-i386 Linux-2.6*-x86_64
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools41/distinfo,v
retrieving revision 1.25
diff -u -r1.25 distinfo
--- distinfo    20 Jan 2013 15:21:54 -0000      1.25
+++ distinfo    14 Mar 2013 19:45:16 -0000
@@ -46,5 +46,7 @@
 SHA1 (patch-ioemu-qemu-xen_xen-hooks.mak) = 
a00d9a9fd0fbb9fd89788b9dfaf5b389a28d47e2
 SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0
 SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9
+SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc
+SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199
 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5
 SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7
Index: patches/patch-ocaml_Makefile.rules
===================================================================
RCS file: patches/patch-ocaml_Makefile.rules
diff -N patches/patch-ocaml_Makefile.rules
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ocaml_Makefile.rules  14 Mar 2013 19:45:16 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ocaml/Makefile.rules.orig  2012-08-10 13:51:28.000000000 +0000
++++ ocaml/Makefile.rules
+@@ -65,7 +65,7 @@ define OCAML_LIBRARY_template
+  $(1)_stubs.a: $(foreach obj,$$($(1)_C_OBJS),$(obj).o)
+       $(call mk-caml-stubs,$$@, $$+)
+  lib$(1)_stubs.a: $(foreach obj,$($(1)_C_OBJS),$(obj).o)
+-      $(call mk-caml-lib-stubs,$$@, $$+, $(LIBS_$(1)))
++      $(call mk-caml-lib-stubs,$$@, $$+, -dllpath $(PREFIX)/lib $(LIBS_$(1)))
+ endef
+ 
+ define OCAML_NOC_LIBRARY_template
Index: patches/patch-ocaml_common.make
===================================================================
RCS file: patches/patch-ocaml_common.make
diff -N patches/patch-ocaml_common.make
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ocaml_common.make     14 Mar 2013 19:45:16 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- ocaml/common.make.orig     2013-03-13 09:31:47.000000000 +0000
++++ ocaml/common.make
+@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
+ CC ?= gcc
+ OCAMLOPT ?= ocamlopt
+ OCAMLC ?= ocamlc
+-OCAMLMKLIB ?= ocamlmklib
++OCAMLMKLIB ?= ocamlmklib -elfmode
+ OCAMLDEP ?= ocamldep
+ OCAMLLEX ?= ocamllex
+ OCAMLYACC ?= ocamlyacc