[Pkg-xen-changes] [xen] 01/02: Revert "Parameterize ocaml support."

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch develop
in repository xen.

commit 3a742cf279489833b3e79fb612f93c382daf3505
Author: Bastian Blank <waldi at debian.org>
Date:   Mon Aug 18 09:27:47 2014 +0200

    Revert "Parameterize ocaml support."
    
    This reverts commit 21c2b912623b0ba50c36320779eed353e899c5b0.
---
 debian/bin/gencontrol.py | 3 ---
 debian/rules.real        | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 758c778..40f8837 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -65,15 +65,12 @@ 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 663362e..b92fb51 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -1,7 +1,5 @@
 include /usr/share/dpkg/default.mk
-ifeq ($(WITH_OCAML),yes)
 include /usr/share/ocaml/ocamlvars.mk
-endif
 
 export DH_OPTIONS
 
@@ -19,10 +17,8 @@ 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
@@ -112,9 +108,7 @@ $(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
@@ -186,7 +180,6 @@ 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)
@@ -217,7 +210,6 @@ 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