[neon/qt/qbs/Neon/testing] debian: Add one more file to debian/patches/no_nosys_specs.diff.

Dmitry Shachnev null at kde.org
Thu May 20 10:00:34 BST 2021


Git commit 9e7ed14d4882369606a0e177196a3fcc2ea14a1d by Dmitry Shachnev.
Committed on 05/01/2021 at 18:15.
Pushed by sitter into branch 'Neon/testing'.

Add one more file to debian/patches/no_nosys_specs.diff.

To fix build on arm*.

M  +2    -0    debian/changelog
M  +15   -1    debian/patches/no_nosys_specs.diff

https://invent.kde.org/neon/qt/qbs/commit/9e7ed14d4882369606a0e177196a3fcc2ea14a1d

diff --git a/debian/changelog b/debian/changelog
index fda92a3..4d8add2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.18.0-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Add one more file to debian/patches/no_nosys_specs.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 Jan 2021 21:13:25 +0300
 
diff --git a/debian/patches/no_nosys_specs.diff b/debian/patches/no_nosys_specs.diff
index 9bd42a2..7422c67 100644
--- a/debian/patches/no_nosys_specs.diff
+++ b/debian/patches/no_nosys_specs.diff
@@ -2,8 +2,22 @@ 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-12-26
+Last-Update: 2021-01-05
 
+--- a/examples/baremetal/pca10001/greenblink/greenblink.qbs
++++ b/examples/baremetal/pca10001/greenblink/greenblink.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: "pca10001-greenblink"
+     cpp.cLanguageVersion: "c99"
 --- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
 +++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
 @@ -54,10 +54,7 @@ CppApplication {



More information about the Neon-commits mailing list