From d57675fc67455faf7c68d4003a1ce884779e2c7c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 3 Apr 2023 10:17:38 +0200
Subject: Merging upstream version 2.4+really2.3.

This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667.
---
 .github/cross/clang.txt          |  5 -----
 .github/cross/ubuntu-armhf.txt   |  1 -
 .github/cross/ubuntu-ppc64le.txt |  1 -
 .github/cross/ubuntu-s390x.txt   | 18 ------------------
 4 files changed, 25 deletions(-)
 delete mode 100644 .github/cross/clang.txt
 delete mode 100644 .github/cross/ubuntu-s390x.txt

(limited to '.github/cross')

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-armhf.txt
index 41c8328..2eee70b 100644
--- a/.github/cross/ubuntu-armhf.txt
+++ b/.github/cross/ubuntu-armhf.txt
@@ -4,7 +4,6 @@ ar = '/usr/arm-linux-gnueabihf/bin/ar'
 strip = '/usr/arm-linux-gnueabihf/bin/strip'
 pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 ld = '/usr/bin/arm-linux/gnueabihf-ld'
-exe_wrapper = '/usr/bin/qemu-arm-static'
 
 [properties]
 root = '/usr/arm-linux-gnueabihf'
diff --git a/.github/cross/ubuntu-ppc64le.txt b/.github/cross/ubuntu-ppc64le.txt
index 6baaefb..4cf6a92 100644
--- a/.github/cross/ubuntu-ppc64le.txt
+++ b/.github/cross/ubuntu-ppc64le.txt
@@ -4,7 +4,6 @@ ar = '/usr/powerpc64le-linux-gnu/bin/ar'
 strip = '/usr/powerpc64le-linux-gnu/bin/strip'
 pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'
 ld = '/usr/bin/powerpc64le-linux-gnu-ld'
-exe_wrapper = '/usr/bin/qemu-ppc64le-static'
 
 [properties]
 root = '/usr/powerpc64le-linux-gnu'
diff --git a/.github/cross/ubuntu-s390x.txt b/.github/cross/ubuntu-s390x.txt
deleted file mode 100644
index 51a3511..0000000
--- a/.github/cross/ubuntu-s390x.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-[binaries]
-c = '/usr/bin/s390x-linux-gnu-gcc'
-ar = '/usr/s390x-linux-gnu/bin/ar'
-strip = '/usr/s390x-linux-gnu/bin/strip'
-pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'
-ld = '/usr/bin/s390x-linux-gnu-ld'
-exe_wrapper = '/usr/bin/qemu-s390x-static'
-
-[properties]
-root = '/usr/s390x-linux-gnu'
-has_function_printf = true
-skip_sanity_check = true
-
-[host_machine]
-system = 'linux'
-cpu_family = 's390x'
-cpu = ''
-endian = 'big'
-- 
cgit v1.2.3