DEB tdeedu: Require kalzium/solver only if ocamldep is available.

This solve FTBFS on some architectures.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d2f604b56b)
pull/92/head
Slávek Banko 5 years ago
parent cf0c967629
commit c51c82ef73
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -16,6 +16,12 @@ DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity'
PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-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 := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \
@ -25,7 +31,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \ -DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" -DWITH_ALL_OPTIONS="ON" \
-DWITH_OCAML_SOLVER="$(HAVE_OCAMLDEP)"
DEB_MAKE_CHECK_TARGET = check DEB_MAKE_CHECK_TARGET = check

@ -16,6 +16,12 @@ DEB_DH_MAKESHLIBS_ARGS_libkiten1-trinity := -V'libkiten1-trinity'
PACKAGES_WITH_LIBS := libtdeedu3-trinity libkiten1-trinity kvoctrain-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 := \ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \
@ -25,7 +31,8 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \ -DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON" -DWITH_ALL_OPTIONS="ON" \
-DWITH_OCAML_SOLVER="$(HAVE_OCAMLDEP)"
DEB_MAKE_CHECK_TARGET = check DEB_MAKE_CHECK_TARGET = check

Loading…
Cancel
Save