Merging upstream version 1.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 0 insertions, 11 deletions

diff --git a/.github/cross/clang.txt b/.github/cross/clang.txt
deleted file mode 100644
index 1484a3e..0000000
--- a/.github/cross/clang.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[binaries]
-c = 'clang'
-cpp = 'clang++'
-strip = 'strip'
-pkgconfig = 'pkg-config'
diff --git a/.github/cross/ubuntu-armhf.txt b/.github/cross/ubuntu-cross-armhf.txt
index 41c8328..41c8328 100644
--- a/.github/cross/ubuntu-armhf.txt
+++ b/.github/cross/ubuntu-cross-armhf.txt
diff --git a/.github/cross/ubuntu-ppc64le.txt b/.github/cross/ubuntu-cross-ppc64le.txt
index 6baaefb..6baaefb 100644
--- a/.github/cross/ubuntu-ppc64le.txt
+++ b/.github/cross/ubuntu-cross-ppc64le.txt
diff --git a/.github/cross/ubuntu-s390x.txt b/.github/cross/ubuntu-cross-s390x.txt
index 51a3511..51a3511 100644
--- a/.github/cross/ubuntu-s390x.txt
+++ b/.github/cross/ubuntu-cross-s390x.txt
diff --git a/.github/cross/ubuntu-static.txt b/.github/cross/ubuntu-static.txt
deleted file mode 100644
index d4d6c9a..0000000
--- a/.github/cross/ubuntu-static.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[properties]
-c_args = '-static'
-cpp_args = c_args
-
-[binaries]
-c = '/usr/bin/gcc'