From 93cb16b7a2ae2dc1daac2bf54efd7db89d97a420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 29 Jun 2019 12:51:05 +0200 Subject: [PATCH] DEB kima: Build nvidia support only for amd64 and i386. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/_base/applications/kima/debian/control | 3 ++- debian/_base/applications/kima/debian/rules | 5 ++++- ubuntu/_base/applications/kima/debian/control | 3 ++- ubuntu/_base/applications/kima/debian/rules | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/_base/applications/kima/debian/control b/debian/_base/applications/kima/debian/control index 5e9671bf4..65856a9dc 100644 --- a/debian/_base/applications/kima/debian/control +++ b/debian/_base/applications/kima/debian/control @@ -2,7 +2,8 @@ Source: kima-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libxnvctrl-dev | nvidia-settings +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, + libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386] Standards-Version: 3.8.4 Package: kima-trinity diff --git a/debian/_base/applications/kima/debian/rules b/debian/_base/applications/kima/debian/rules index cee2a3058..5598f7f9f 100755 --- a/debian/_base/applications/kima/debian/rules +++ b/debian/_base/applications/kima/debian/rules @@ -7,6 +7,8 @@ include debian/cdbs/debian-tde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ @@ -16,4 +18,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_NVCONTROL="$(WITH_NVCONTROL)" diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/kima/debian/control index 22547bcd7..eb5bcef62 100644 --- a/ubuntu/_base/applications/kima/debian/control +++ b/ubuntu/_base/applications/kima/debian/control @@ -2,7 +2,8 @@ Source: kima-trinity Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libxnvctrl-dev | nvidia-settings +Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, + libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386] Standards-Version: 3.8.4 Package: kima-trinity diff --git a/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/kima/debian/rules index cee2a3058..5598f7f9f 100755 --- a/ubuntu/_base/applications/kima/debian/rules +++ b/ubuntu/_base/applications/kima/debian/rules @@ -7,6 +7,8 @@ include debian/cdbs/debian-tde.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ -DCONFIG_INSTALL_DIR="/etc/trinity" \ @@ -16,4 +18,5 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_ALL_OPTIONS="ON" + -DWITH_ALL_OPTIONS="ON" \ + -DWITH_NVCONTROL="$(WITH_NVCONTROL)"