diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-06-28 16:57:15 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-28 16:57:43 +0200 |
| commit | c51c82ef736e35446525d35f70b8d7cd5b380361 (patch) | |
| tree | e6668de6070078960cbf4e92f0e7d33b2cc04cbd | |
| parent | cf0c9676299cdcbe2c4d050d887430c8386be235 (diff) | |
| download | tde-packaging-c51c82ef736e35446525d35f70b8d7cd5b380361.tar.gz tde-packaging-c51c82ef736e35446525d35f70b8d7cd5b380361.zip | |
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 d2f604b56bb2cbfdc344d21043c877cb9ee29c2b)
| -rwxr-xr-x | debian/_base/tdeedu/debian/rules | 9 | ||||
| -rwxr-xr-x | 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 |