From 34a4b68cbe4877a7f45285aa50fdae49d955ade2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 3 Jan 2025 14:23:27 +0100 Subject: DEB libkdcraw: Build without OpenMP on i386 architecture. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit fa031c5be8c5ad8ef6089d01912adda763e5d7c4) --- debian/_base/libraries/libkdcraw/debian/control | 2 +- debian/_base/libraries/libkdcraw/debian/rules | 5 ++++- ubuntu/_base/libraries/libkdcraw/debian/control | 2 +- ubuntu/_base/libraries/libkdcraw/debian/rules | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/_base/libraries/libkdcraw/debian/control b/debian/_base/libraries/libkdcraw/debian/control index 7c51c5b46..be6f6e763 100644 --- a/debian/_base/libraries/libkdcraw/debian/control +++ b/debian/_base/libraries/libkdcraw/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Achim Bohnet , Fathi Boudra Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] + libomp-dev [amd64 arm64 armhf mips64el ppc64el riscv64] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/debian/_base/libraries/libkdcraw/debian/rules b/debian/_base/libraries/libkdcraw/debian/rules index f69d1ece9..6a83cc74c 100755 --- a/debian/_base/libraries/libkdcraw/debian/rules +++ b/debian/_base/libraries/libkdcraw/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,7 +16,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_OPENMP="$(HAVE_OPENMP)" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: diff --git a/ubuntu/_base/libraries/libkdcraw/debian/control b/ubuntu/_base/libraries/libkdcraw/debian/control index 26cb1d4ef..eafecaec3 100644 --- a/ubuntu/_base/libraries/libkdcraw/debian/control +++ b/ubuntu/_base/libraries/libkdcraw/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team , Achim Bohnet , Fathi Boudra Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, liblcms2-dev | liblcms1-dev, libjpeg-dev, pkg-config, - libomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] | libiomp-dev [amd64 arm64 armhf i386 mips64el ppc64el] + libomp-dev [amd64 arm64 armhf mips64el ppc64el riscv64] Standards-Version: 3.8.4 Homepage: http://www.kipi-plugins.org/ diff --git a/ubuntu/_base/libraries/libkdcraw/debian/rules b/ubuntu/_base/libraries/libkdcraw/debian/rules index f69d1ece9..6a83cc74c 100755 --- a/ubuntu/_base/libraries/libkdcraw/debian/rules +++ b/ubuntu/_base/libraries/libkdcraw/debian/rules @@ -4,6 +4,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk +HAVE_OPENMP= $(if $(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libomp*.so),ON,OFF) + DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ @@ -14,7 +16,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_OPENMP="$(HAVE_OPENMP)" # add installed liblcms*-dev to libkdcraw3-trinity-dev depends common-binary-arch:: -- cgit v1.2.1