From 6e1f4c0e954e0be84630ee48717ecc18b523fdbc Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 9 Apr 2017 08:02:54 +0000 Subject: [PATCH] bring back the ocaml stuff --- debian/rules | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index af45d0cd..c9b04a4c 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,8 @@ DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH_BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) +OCAML_STDLIB_DIR ?= $(shell ocamlc -where) + LDFLAGS_EXTRA = CXXFLAGS_EXTRA = -std=c++0x CONFIGURE_EXTRA = @@ -132,7 +134,7 @@ endif LLD_ENABLE=NO %: - dh $@ + dh $@ --with ocaml @@ -142,9 +144,14 @@ preconfigure: echo "$$f => $$f2"; \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ + -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ done +# Override this two targets. They are trying to manage the .in conversion for me +override_dh_ocamlinit: +override_dh_ocamlclean: + override_dh_auto_configure: preconfigure echo "Using gcc: " $(CC) -v