[Pkg-xen-changes] [xen] 04/05: Parameterize ocaml support.
Ian Campbell
ijc-guest at moszumanska.debian.org
Wed Jul 30 19:53:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
ijc-guest pushed a commit to branch feature/arm
in repository xen.
commit 6f326c3a47c69e7a556ef5a599181af0dbe733b9
Author: Ian Campbell <ijc at hellion.org.uk>
Date: Fri Jul 18 23:24:29 2014 +0100
Parameterize ocaml support.
It is currently enabled for all architectures but arm64 currently lacks
ocamlopt so will want to disable ocaml.
---
debian/bin/gencontrol.py | 3 +++
debian/rules.real | 8 ++++++++
2 files changed, 11 insertions(+)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 40f8837..758c778 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -65,12 +65,15 @@ class Gencontrol(Base):
config_entry = self.config.merge('base', arch, featureset, flavour)
config_description = self.config.merge('description', arch, featureset, flavour)
+ config_entry.setdefault('with-ocaml', 'yes')
+
vars['class'] = config_description['hardware']
vars['longclass'] = config_description.get('hardware-long') or vars['class']
for i in (
('xen-arch', 'XEN_ARCH'),
('image-suffix', 'IMAGE_SUFFIX'),
+ ('with-ocaml', 'WITH_OCAML')
):
if config_entry.has_key(i[0]):
makeflags[i[1]] = config_entry[i[0]]
diff --git a/debian/rules.real b/debian/rules.real
index ebdd46e..97e8cf8 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -1,5 +1,7 @@
include /usr/share/dpkg/default.mk
+ifeq ($(WITH_OCAML),yes)
include /usr/share/ocaml/ocamlvars.mk
+endif
export DH_OPTIONS
@@ -17,8 +19,10 @@ binary-arch-arch: install-libxen-dev_$(ARCH)
binary-arch-arch: install-libxenstore_$(ARCH)
binary-arch-arch: install-utils_$(ARCH)
binary-arch-arch: install-xenstore-utils_$(ARCH)
+ifeq ($(WITH_OCAML),yes)
binary-arch-arch: install-lib-ocaml-dev_$(ARCH)
binary-arch-arch: install-lib-ocaml_$(ARCH)
+endif
binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
binary-indep: install-utils-common
@@ -109,7 +113,9 @@ $(STAMPS_DIR)/install-utils_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH)
$(STAMPS_DIR)/install-utils_$(ARCH): INSTALL_DIR = $(BUILD_DIR)/install-utils_$(ARCH)
$(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
@rm -rf $(INSTALL_DIR)
+ifeq ($(WITH_OCAML),yes)
mkdir -p $(INSTALL_DIR)/$(OCAML_DLL_DIR)
+endif
+$(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG)
ifneq ($(filter i386 amd64,$(ARCH)),)
# hvmloader
@@ -181,6 +187,7 @@ install-libxen-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
dh_shlibdeps
+$(MAKE_SELF) install-base
+ifeq ($(WITH_OCAML),yes)
install-lib-ocaml_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
install-lib-ocaml_$(ARCH): PACKAGE_NAME = libxen-ocaml
install-lib-ocaml_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -211,6 +218,7 @@ install-lib-ocaml-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
dh_shlibdeps
dh_ocaml
+$(MAKE_SELF) install-base
+endif
install-libxenstore_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
install-libxenstore_$(ARCH): PACKAGE_NAME = libxenstore3.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git
More information about the Pkg-xen-changes
mailing list