From d2f604b56bb2cbfdc344d21043c877cb9ee29c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 28 Jun 2019 16:57:15 +0200 Subject: [PATCH] DEB tdeedu: Require kalzium/solver only if ocamldep is available. This solve FTBFS on some architectures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/_base/tdeedu/debian/rules | 9 ++++++++- ubuntu/_base/tdeedu/debian/rules | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/_base/tdeedu/debian/rules b/debian/_base/tdeedu/debian/rules index eb250bf48..366ff2006 100755 --- a/debian/_base/tdeedu/debian/rules +++ b/debian/_base/tdeedu/debian/rules @@ -16,6 +16,12 @@ DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity' PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity +# Although ocaml is available for all architectures, +# ocamldep for some architectures is not available. +# Therefore, kalzium/solver build will be required +# according to ocamldep availability. +HAVE_OCAMLDEP = $(if $(wildcard /usr/bin/ocamldep),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ @@ -25,7 +31,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_OCAML_SOLVER="$(HAVE_OCAMLDEP)" DEB_MAKE_CHECK_TARGET = check diff --git a/ubuntu/_base/tdeedu/debian/rules b/ubuntu/_base/tdeedu/debian/rules index eb250bf48..366ff2006 100755 --- a/ubuntu/_base/tdeedu/debian/rules +++ b/ubuntu/_base/tdeedu/debian/rules @@ -16,6 +16,12 @@ DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity' PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-trinity +# Although ocaml is available for all architectures, +# ocamldep for some architectures is not available. +# Therefore, kalzium/solver build will be required +# according to ocamldep availability. +HAVE_OCAMLDEP = $(if $(wildcard /usr/bin/ocamldep),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ @@ -25,7 +31,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_OCAML_SOLVER="$(HAVE_OCAMLDEP)" DEB_MAKE_CHECK_TARGET = check