From a3a99e4d149c1e1742ef1c686614a9d7dd59dfd6 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 4 Mar 2025 17:53:22 +0100 Subject: [PATCH] build mingw for testing --- configure/os/CONFIG.Linux.windows-x64 | 1 + configure/os/CONFIG.RHEL8-x86_64.win32-x86-mingw | 1 + configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw | 1 + configure/os/CONFIG.RHEL9-x86_64.Common | 6 ++++++ configure/os/CONFIG.RHEL9-x86_64.win32-x86-mingw | 1 + configure/os/CONFIG.RHEL9-x86_64.windows-x64-mingw | 1 + configure/os/CONFIG_SITE.RHEL8-x86_64.win32-x86-mingw | 1 + configure/os/CONFIG_SITE.RHEL8-x86_64.windows-x64-mingw | 1 + configure/os/CONFIG_SITE.RHEL9-x86_64.win32-x86-mingw | 1 + configure/os/CONFIG_SITE.RHEL9-x86_64.windows-x64-mingw | 1 + configure/os/CONFIG_SITE.linux-x86_64.Common | 5 +++++ 11 files changed, 20 insertions(+) create mode 100644 configure/os/CONFIG.RHEL8-x86_64.win32-x86-mingw create mode 100644 configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw create mode 100644 configure/os/CONFIG.RHEL9-x86_64.win32-x86-mingw create mode 100644 configure/os/CONFIG.RHEL9-x86_64.windows-x64-mingw create mode 100644 configure/os/CONFIG_SITE.RHEL8-x86_64.win32-x86-mingw create mode 100644 configure/os/CONFIG_SITE.RHEL8-x86_64.windows-x64-mingw create mode 100644 configure/os/CONFIG_SITE.RHEL9-x86_64.win32-x86-mingw create mode 100644 configure/os/CONFIG_SITE.RHEL9-x86_64.windows-x64-mingw diff --git a/configure/os/CONFIG.Linux.windows-x64 b/configure/os/CONFIG.Linux.windows-x64 index 916d08a28..b79cd9c9f 100644 --- a/configure/os/CONFIG.Linux.windows-x64 +++ b/configure/os/CONFIG.Linux.windows-x64 @@ -8,3 +8,4 @@ export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH) export WINEDEBUG=fixme-all export WINEDLLOVERRIDES="mscoree,mshtml=" export WINE = wine64 +export WINEPATH = $(realpath $(INSTALL_BIN)) diff --git a/configure/os/CONFIG.RHEL8-x86_64.win32-x86-mingw b/configure/os/CONFIG.RHEL8-x86_64.win32-x86-mingw new file mode 100644 index 000000000..8ce90d312 --- /dev/null +++ b/configure/os/CONFIG.RHEL8-x86_64.win32-x86-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG.linux-x86_64.win32-x86-mingw diff --git a/configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw b/configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw new file mode 100644 index 000000000..58484c14e --- /dev/null +++ b/configure/os/CONFIG.RHEL8-x86_64.windows-x64-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG.linux-x86_64.windows-x64-mingw diff --git a/configure/os/CONFIG.RHEL9-x86_64.Common b/configure/os/CONFIG.RHEL9-x86_64.Common index 26c65b727..d515b70d9 100644 --- a/configure/os/CONFIG.RHEL9-x86_64.Common +++ b/configure/os/CONFIG.RHEL9-x86_64.Common @@ -1,3 +1,9 @@ #CONFIG.$(EPICS_HOST_ARCH).Common is required by build system #Include definitions common to linux hosts include $(CONFIG)/os/CONFIG.linux-x86_64.Common + +# Windows 32 bit cross builds using mingw +# (broken on RHEL8) + +CROSS_COMPILER_TARGET_ARCHS += win32-x86-mingw +CROSS_COMPILER_RUNTEST_ARHCS += win32-x86-mingw diff --git a/configure/os/CONFIG.RHEL9-x86_64.win32-x86-mingw b/configure/os/CONFIG.RHEL9-x86_64.win32-x86-mingw new file mode 100644 index 000000000..8ce90d312 --- /dev/null +++ b/configure/os/CONFIG.RHEL9-x86_64.win32-x86-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG.linux-x86_64.win32-x86-mingw diff --git a/configure/os/CONFIG.RHEL9-x86_64.windows-x64-mingw b/configure/os/CONFIG.RHEL9-x86_64.windows-x64-mingw new file mode 100644 index 000000000..58484c14e --- /dev/null +++ b/configure/os/CONFIG.RHEL9-x86_64.windows-x64-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG.linux-x86_64.windows-x64-mingw diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.win32-x86-mingw b/configure/os/CONFIG_SITE.RHEL8-x86_64.win32-x86-mingw new file mode 100644 index 000000000..2f67e5936 --- /dev/null +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.win32-x86-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw diff --git a/configure/os/CONFIG_SITE.RHEL8-x86_64.windows-x64-mingw b/configure/os/CONFIG_SITE.RHEL8-x86_64.windows-x64-mingw new file mode 100644 index 000000000..06511db26 --- /dev/null +++ b/configure/os/CONFIG_SITE.RHEL8-x86_64.windows-x64-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw diff --git a/configure/os/CONFIG_SITE.RHEL9-x86_64.win32-x86-mingw b/configure/os/CONFIG_SITE.RHEL9-x86_64.win32-x86-mingw new file mode 100644 index 000000000..2f67e5936 --- /dev/null +++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.win32-x86-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.win32-x86-mingw diff --git a/configure/os/CONFIG_SITE.RHEL9-x86_64.windows-x64-mingw b/configure/os/CONFIG_SITE.RHEL9-x86_64.windows-x64-mingw new file mode 100644 index 000000000..06511db26 --- /dev/null +++ b/configure/os/CONFIG_SITE.RHEL9-x86_64.windows-x64-mingw @@ -0,0 +1 @@ +include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.windows-x64-mingw diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common index 753e6b610..8e10806a0 100644 --- a/configure/os/CONFIG_SITE.linux-x86_64.Common +++ b/configure/os/CONFIG_SITE.linux-x86_64.Common @@ -13,6 +13,11 @@ GNU_HOST_ARCH_64=x86_64 # Windows cross builds using Wine CROSS_COMPILER_TARGET_ARCHS += windows-x64 +CROSS_COMPILER_RUNTEST_ARCHS += windows-x64 + +# Windows cross builds using mingw +CROSS_COMPILER_TARGET_ARCHS += windows-x64-mingw +CROSS_COMPILER_RUNTEST_ARCHS += windows-x64-mingw # IOxOS IFC1211 #CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64