[neon/qt/qtwebengine/Neon/release] debian: Disable CONFIG_THUMB to fix build on armhf.

Dmitry Shachnev null at kde.org
Thu Jul 14 12:41:53 BST 2022


Git commit 8baa7ec11d58448056e2ac83c4d37d0e0fece483 by Dmitry Shachnev.
Committed on 26/06/2022 at 18:20.
Pushed by jriddell into branch 'Neon/release'.

Disable CONFIG_THUMB to fix build on armhf.

M  +2    -0    debian/changelog
A  +17   -0    debian/patches/armhf-no-thumb.patch
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qtwebengine/commit/8baa7ec11d58448056e2ac83c4d37d0e0fece483

diff --git a/debian/changelog b/debian/changelog
index 86c8c37..ebda6b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebengine-opensource-src (5.15.10+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Disable CONFIG_THUMB to fix build on armhf.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 26 Jun 2022 18:34:00 +0300
 
diff --git a/debian/patches/armhf-no-thumb.patch b/debian/patches/armhf-no-thumb.patch
new file mode 100644
index 0000000..07464af
--- /dev/null
+++ b/debian/patches/armhf-no-thumb.patch
@@ -0,0 +1,17 @@
+Description: disable CONFIG_THUMB on armhf
+ Fixes errors about bad instruction `ldrhcs'.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2022-06-26
+
+--- a/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/config.h
++++ b/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chrome/linux/arm/config.h
+@@ -593,7 +593,7 @@
+ #define CONFIG_NEON_CLOBBER_TEST 0
+ #define CONFIG_OSSFUZZ 0
+ #define CONFIG_PIC 1
+-#define CONFIG_THUMB 1
++#define CONFIG_THUMB 0
+ #define CONFIG_VALGRIND_BACKTRACE 0
+ #define CONFIG_XMM_CLOBBER_TEST 0
+ #define CONFIG_BSFS 1
diff --git a/debian/patches/series b/debian/patches/series
index 9eb09e2..67c54e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ mips64el-crashpad.patch
 mips64el-bad-define.patch
 mipsel-syscall-ranges.patch
 mips64el-kernel_stat64.patch
+armhf-no-thumb.patch



More information about the Neon-commits mailing list