Merge ~liushuyu-011/ubuntu/+source/libgrokj2k:ubuntu/devel into ubuntu/+source/libgrokj2k:ubuntu/devel

Proposed by Zixing Liu
Status: Rejected
Rejected by: Andreas Hasenack
Proposed branch: ~liushuyu-011/ubuntu/+source/libgrokj2k:ubuntu/devel
Merge into: ubuntu/+source/libgrokj2k:ubuntu/devel
Diff against target: 47 lines (+18/-0)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/rules (+10/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack Disapprove
Review via email: mp+475563@code.launchpad.net

Description of the change

This merge proposal fixes the FTBFS issue on armhf by switching the compiler to Clang/LLVM.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16579758/+listing-archive-extra

To post a comment you must log in.
Revision history for this message
Lukas Märdian (slyon) wrote :

Please note that there's an upstream fix that is supposedly fixing the armhf FTBFS:

* https://mentors.debian.net/package/libgrokj2k/
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1085165

Revision history for this message
Dave Jones (waveform) wrote :

Is this still the right way forward, given the patch posted on the Debian report? Reading through that report it seems there's also a new version potentially ready for inclusion in Debian, but pending upload.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Since debian has also removed the package, and it had no delta, let's leave it be. If debian reintroduces the package, we can get it.

review: Disapprove

Unmerged commits

f04d595... by Zixing Liu

changelog

9300d6a... by Zixing Liu

d/rules: fix armhf SIMD errors by using Clang/LLVM to generate a fallback

code path for fp16 SIMD element-wise widening conversion

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index d6ae1f9..bb0f02e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1libgrokj2k (10.0.5-1ubuntu1) plucky; urgency=medium
2
3 * d/rules: fix armhf SIMD errors by using Clang/LLVM to generate a fallback
4 fp16 code path (GCC does not support this as of GCC 15).
5
6 -- Zixing Liu <zixing.liu@canonical.com> Mon, 21 Oct 2024 15:32:11 -0600
7
1libgrokj2k (10.0.5-1build5) plucky; urgency=medium8libgrokj2k (10.0.5-1build5) plucky; urgency=medium
29
3 * No-change rebuild for libperl soname.10 * No-change rebuild for libperl soname.
diff --git a/debian/control b/debian/control
index 2b69295..a38edfa 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: cmake (>= 3.16.0),
12 libjpeg-dev,12 libjpeg-dev,
13 zlib1g-dev,13 zlib1g-dev,
14 libimage-exiftool-perl,14 libimage-exiftool-perl,
15 clang [armhf],
15Build-Depends-Indep: doxygen16Build-Depends-Indep: doxygen
16Standards-Version: 4.6.1.017Standards-Version: 4.6.1.0
17Section: libs18Section: libs
diff --git a/debian/rules b/debian/rules
index 77be8b0..20a416c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,16 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
6# as per upstream request:6# as per upstream request:
7export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden7export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden
88
9ifeq (armhf,$(DEB_HOST_ARCH))
10# FP16 is an armv8.2 feature and GCC does not know how to generate fallback
11# code for FP16 Neon AdvSIMD operations, we use clang to do that
12 export CC=clang
13 export CXX=clang++
14# Downgrade DWARF version to make dwz happy
15 export DEB_CFLAGS_MAINT_APPEND+=-gdwarf-4
16 export DEB_CXXFLAGS_MAINT_APPEND+=-gdwarf-4
17endif
18
9%:19%:
10 dh $@20 dh $@
1121

Subscribers

People subscribed via source and target branches

to all changes: