This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository ocamlbuild.
commit 4df02c1e1d6025469c42e653cba30481b1499366
Author: Ximin Luo <infini...@debian.org>
Date: Thu Sep 29 00:56:12 2016 +0200
Support architectures withot a native compiler
---
debian/control | 2 +-
debian/rules | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index c2ad016..838c61b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
Uploaders: Ximin Luo <infini...@debian.org>
-Build-Depends: debhelper (>= 9), ocaml, ocaml-native-compilers
+Build-Depends: debhelper (>= 9), ocaml-native-compilers | ocaml
Standards-Version: 3.9.8
Homepage: https://github.com/ocaml/ocamlbuild/
Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.git
diff --git a/debian/rules b/debian/rules
index 95940f9..be64919 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,17 @@
%:
dh $@
+OCAMLBUILD_CFG = \
+ OCAMLBUILD_PREFIX=/usr \
+ OCAMLBUILD_BINDIR=/usr/bin \
+ OCAMLBUILD_LIBDIR=/usr/lib/ocaml
override_dh_auto_configure:
- $(MAKE) OCAMLBUILD_PREFIX=/usr \
- OCAMLBUILD_BINDIR=/usr/bin \
- OCAMLBUILD_LIBDIR=/usr/lib/ocaml/ \
- configure
+ if [ -x /usr/bin/ocamlopt ]; then \
+ $(MAKE) $(OCAMLBUILD_CFG) OCAML_NATIVE=true configure; \
+ else \
+ $(MAKE) $(OCAMLBUILD_CFG) OCAML_NATIVE=false configure; \
+ fi
override_dh_auto_install:
dh_auto_install -- CHECK_IF_PREINSTALLED=false
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
