diff options
Diffstat (limited to 'ubuntu/_base')
| -rw-r--r-- | ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install | 2 | ||||
| -rw-r--r-- | ubuntu/_base/libraries/libkdcraw/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/_base/libraries/libkdcraw/debian/rules | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install index a5f9f651f..36d522ec4 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity-dev.install @@ -182,7 +182,7 @@ debian/tmp/opt/trinity/include/tdeconfigdialogmanager.h debian/tmp/opt/trinity/include/tdeconfig.h debian/tmp/opt/trinity/include/tdeconfigskeleton.h debian/tmp/opt/trinity/include/kcpuinfo.h -debian/tmp/opt/trinity/include/kcrash.h +debian/tmp/opt/trinity/include/tdecrash.h debian/tmp/opt/trinity/include/kcursor.h debian/tmp/opt/trinity/include/kcustommenueditor.h debian/tmp/opt/trinity/include/kdatagramsocket.h 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 <pkg-kde-extras@lists.alioth.de Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org> 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:: |