tags 619344 patch user 619344 [email protected] usertags 619344 multiarch thanks
Hey guys, Attached is a patch to fix the libX11 lookup error when converted to multiarch. It's not a perfect patch; ideally, libX11 would be handled the same as other libraries, using 'hasgot' to determine if it's already on the linker path before probing around in other directories. But it does fix the problem, though it can't really be applied to ocaml until dpkg 1.16.0 is uploaded to Debian. After applying this patch, I unfortunately still get a build failure in natty, but this appears to be unrelated to multiarch so may be Ubuntu-specific: ../boot/ocamlrun ../ocamlopt -warn-error A -nostdlib -g `./Compflags random.cmx` -c random.ml /tmp/camlasm0c9c8e.s: Assembler messages: /tmp/camlasm0c9c8e.s:1959: Error: .size expression for camlRandom__rawfloat_126 does not evaluate to a constant File "random.ml", line 1, characters 0-1: Error: Assembler error, input left in file /tmp/camlasm0c9c8e.s make[3]: *** [random.cmx] Error 2 make[3]: Leaving directory `/home/vorlon/multiarch/ocaml-3.11.2/stdlib' I'll dig into it and let you know if I find out otherwise... -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
diff -u ocaml-3.11.2/debian/rules ocaml-3.11.2/debian/rules --- ocaml-3.11.2/debian/rules +++ ocaml-3.11.2/debian/rules @@ -17,6 +17,7 @@ OCAML_OPT_ARCH := $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS)) OCAML_HAVE_OCAMLOPT := $(if $(OCAML_OPT_ARCH),yes,no) OCAML_OCAMLDOC_DESTDIR_HTML = +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # dh_ocamlinit cannot be used for ocaml itself include debian/ocamlinit.mk @@ -51,6 +52,7 @@ CONFIGURE_OPTS := \ --with-pthread -prefix /usr \ -libdir $(OCAML_STDLIB_DIR) \ + -x11lib /usr/lib/$(DEB_HOST_MULTIARCH) \ -mandir /usr/share/man \ -tkdefs "-I/usr/include/tcl8.5" \ -tklibs "-L/usr/lib -ltk8.5 -ltcl8.5" diff -u ocaml-3.11.2/debian/control ocaml-3.11.2/debian/control --- ocaml-3.11.2/debian/control +++ ocaml-3.11.2/debian/control @@ -10,6 +10,7 @@ Stéphane Glondu <[email protected]>, Mehdi Dogguy <[email protected]> Build-Depends: + dpkg-dev (>= 1.16.0), debhelper (>= 7), autotools-dev, tcl8.5-dev, diff -u ocaml-3.11.2/debian/control.in ocaml-3.11.2/debian/control.in --- ocaml-3.11.2/debian/control.in +++ ocaml-3.11.2/debian/control.in @@ -10,6 +10,7 @@ Stéphane Glondu <[email protected]>, Mehdi Dogguy <[email protected]> Build-Depends: + dpkg-dev (>= 1.16.0), debhelper (>= 7), autotools-dev, tcl8.5-dev,
signature.asc
Description: Digital signature
