On Mon, 19 Feb 2024 11:47:25 +0100 Tino Mettler <tino.mett...@tikei.de> wrote:
Version: 4.4.2-1.1

Hi,

OPENMP support was disabled for arm64 in the 4.4.2-1.1 package, so this
bug can be closed.

I also stumbled again over this FTBFS bug after accidently enabling
OPENMP yesterday for the darktable 4.6.1-1 package, so it looks like
this workaround is still needed.


Only gcc-14 was patched.
I tried to force gcc-14 and g++-14 on arm64, and this bug is indeed fixed.
Until Matthias updates gcc-13 with the patch for 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111677#add_comment
We can't really drop the hack (unless we add the hack to use gcc-14)


diff -Nru darktable-4.6.1/debian/control darktable-4.6.1/debian/control
--- darktable-4.6.1/debian/control      2024-02-18 18:29:32.000000000 +0100
+++ darktable-4.6.1/debian/control      2024-02-21 10:16:44.000000000 +0100
@@ -38,7 +38,9 @@
                libsqlite3-dev,
                libtiff-dev,
                libwebp-dev,
-               xsltproc
+               xsltproc,
+               gcc-14 [arm64],
+               g++-14 [arm64]
 Standards-Version: 4.6.2
 Homepage: http://www.darktable.org/
 Vcs-Git: https://salsa.debian.org/debian-phototools-team/darktable.git
diff -Nru darktable-4.6.1/debian/rules darktable-4.6.1/debian/rules
--- darktable-4.6.1/debian/rules        2024-02-18 18:29:32.000000000 +0100
+++ darktable-4.6.1/debian/rules        2024-02-21 10:17:45.000000000 +0100
@@ -14,8 +14,8 @@
 endif
ifeq ($(DEB_HOST_ARCH),arm64)
-        # Disable OPENMP for arm64 builds. See LP: #2038351
-        DISABLE_OPENMP = -DUSE_OPENMP=OFF
+       export CC=gcc-14
+       export CXX=g++-14
 endif
%:
@@ -26,8 +26,7 @@
                -DBINARY_PACKAGE_BUILD=1 \
                -DCMAKE_BUILD_TYPE=Release \
                -DRAWSPEED_ENABLE_LTO=ON \
-               -DDONT_USE_INTERNAL_LIBRAW=ON \
-               $(DISABLE_OPENMP)
+               -DDONT_USE_INTERNAL_LIBRAW=ON
describe-current-version:
        git describe --tags upstream | sed 's,^release-,,;s,-,+,;s,-,~,;'


Otherwise we can just switch to gcc-14 everywhere.

G.

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to