[neon/qt/qbs/Neon/testing] debian: Disable build of arm-gcc.s, it causes errors from as.

[Dmitry Shachnev]

Git commit a6639d529137a0708d62cbf798e82e2603a9eed5 by Dmitry Shachnev.
Committed on 20/09/2020 at 11:56.
Pushed by sitter into branch 'Neon/testing'.

Disable build of arm-gcc.s, it causes errors from as.

M  +3    -1    debian/changelog
A  +18   -0    debian/patches/disable_bad_assembly.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qbs/commit/a6639d529137a0708d62cbf798e82e2603a9eed5

diff --git a/debian/changelog b/debian/changelog
index b806144..7997be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 qbs (1.17.0-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
-  * Do not use nosys.specs on Debian ARM architectures (fixes test failures).
+  * Fix tests failures on ARM:
+    - Do not use nosys.specs, it needs gcc-arm-none-eabi.
+    - Disable build of arm-gcc.s, it causes errors from as.
   * Update debian/libqbscore1.17.symbols from buildds’ logs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Sep 2020 11:37:15 +0300
diff --git a/debian/patches/disable_bad_assembly.diff b/debian/patches/disable_bad_assembly.diff
new file mode 100644
index 0000000..33a13f5
--- /dev/null
+++ b/debian/patches/disable_bad_assembly.diff
@@ -0,0 +1,18 @@
+Description: disable build of arm-gcc.s, it causes errors from as
+ arm-gcc.s:4: Error: operand 1 must be an integer register -- `mov r0,#0'
+ arm-gcc.s:5: Error: unknown mnemonic `bx' -- `bx lr'
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2020-09-20
+
+--- a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
++++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
+@@ -46,8 +46,6 @@ BareMetalApplication {
+             if (qbs.architecture === "stm8")
+                 return true;
+         } else if (qbs.toolchainType === "gcc") {
+-            if (qbs.architecture.startsWith("arm"))
+-                return true;
+             if (qbs.architecture === "avr")
+                 return true;
+             if (qbs.architecture === "avr32")
diff --git a/debian/patches/series b/debian/patches/series
index 00590ce..0e6a1a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ kfreebsd_soname.diff
 processlauncher_destdir.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
+disable_bad_assembly.diff