[neon/qt/qbs/Neon/testing] debian: Do not use nosys.specs on Debian ARM architectures (fixes test failures).

[Dmitry Shachnev]

Git commit 8e807aeb9f3cbc7f3b11a12c7766733e266b2aca by Dmitry Shachnev.
Committed on 20/09/2020 at 08:52.
Pushed by sitter into branch 'Neon/testing'.

Do not use nosys.specs on Debian ARM architectures (fixes test failures).

M  +2    -0    debian/changelog
A  +74   -0    debian/patches/no_nosys_specs.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/qt/qbs/commit/8e807aeb9f3cbc7f3b11a12c7766733e266b2aca

diff --git a/debian/changelog b/debian/changelog
index 6a0e8ad..7c33d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.17.0-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Do not use nosys.specs on Debian ARM architectures (fixes test failures).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 20 Sep 2020 11:37:15 +0300
 
diff --git a/debian/patches/no_nosys_specs.diff b/debian/patches/no_nosys_specs.diff
new file mode 100644
index 0000000..86ac7fd
--- /dev/null
+++ b/debian/patches/no_nosys_specs.diff
@@ -0,0 +1,74 @@
+Description: do not use -specs=nosys.specs on Debian ARM architectures
+ This requires gcc-arm-none-eabi which we do not want to depend on.
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2020-09-20
+
+--- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
++++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
+@@ -54,9 +54,7 @@ CppApplication {
+     condition: {
+         if (!qbs.architecture.startsWith("arm"))
+             return false;
+-        return (qbs.toolchain.contains("gcc")
+-                || qbs.toolchain.contains("keil"))
+-                && !qbs.toolchain.contains("xcode")
++        return false;
+     }
+     name: "pca10040-greenblink"
+     cpp.cLanguageVersion: "c99"
+--- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
++++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+@@ -54,9 +54,7 @@ CppApplication {
+     condition: {
+         if (!qbs.architecture.startsWith("arm"))
+             return false;
+-        return (qbs.toolchain.contains("gcc")
+-                || qbs.toolchain.contains("keil"))
+-                && !qbs.toolchain.contains("xcode")
++        return false;
+     }
+     name: "stm32f103-greenblink"
+     cpp.cLanguageVersion: "c99"
+--- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
++++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+@@ -54,10 +54,7 @@ CppApplication {
+     condition: {
+         if (!qbs.architecture.startsWith("arm"))
+             return false;
+-        return (qbs.toolchain.contains("gcc")
+-                || qbs.toolchain.contains("iar")
+-                || qbs.toolchain.contains("keil"))
+-                && !qbs.toolchain.contains("xcode")
++        return false;
+     }
+     name: "stm32f4discovery-blueblink"
+     cpp.cLanguageVersion: "c99"
+--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
++++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+@@ -81,11 +81,6 @@ CppApplication {
+         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
+         cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
+     }
+-    Properties {
+-        condition: qbs.toolchain.contains("gcc")
+-            && qbs.architecture.startsWith("arm")
+-        cpp.driverFlags: ["-specs=nosys.specs"]
+-    }
+     Properties {
+         condition: qbs.toolchain.contains("gcc")
+             && qbs.architecture === "xtensa"
+--- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
++++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
+@@ -81,11 +81,6 @@ StaticLibrary {
+         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
+         cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
+     }
+-    Properties {
+-        condition: qbs.toolchain.contains("gcc")
+-            && qbs.architecture.startsWith("arm")
+-        cpp.driverFlags: ["-specs=nosys.specs"]
+-    }
+     Properties {
+         condition: qbs.toolchain.contains("gcc")
+             && qbs.architecture === "xtensa"
diff --git a/debian/patches/series b/debian/patches/series
index 267fd05..00590ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ skip_test_concurrent.diff
 kfreebsd_soname.diff
 processlauncher_destdir.diff
 test_sanitizers_only_on_amd64.diff
+no_nosys_specs.diff