From 8dd980e6680d0b2cbed06746feeba263f92d9aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 8 Apr 2025 16:54:29 +0200
Subject: [PATCH] Windows package: remove more MinGW includes from Octave
binary package
In particular, this now removes float.h which was conflicting with the one from
a recent MinGW snapshot.
---
windows/deps/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/windows/deps/Makefile b/windows/deps/Makefile
index c4f823b986..06d53027e4 100644
--- a/windows/deps/Makefile
+++ b/windows/deps/Makefile
@@ -104,7 +104,7 @@ octave64: tarballs/octave-${OCTAVE_VERSION}${OCTAVE_W64_BUILD}-w64.7z
mv octave-${OCTAVE_VERSION}-w64 $@
# Clean up MinGW stuff that interferes with our cross-compiler
cd $@/mingw64/lib && rm -f libadvapi32.a libkernel32.a libmingw32.a libmingwex.a libmoldname.a libmsvcrt.a libpthread.dll.a libshell32.a libuser32.a
- cd $@/mingw64/include && rm -f $$(grep -l "This file is part of the mingw-w64 runtime package" *.h) minwinbase.h omp.h swprintf.inl
+ cd $@/mingw64/include && rm -f $$(grep -l "This file is part of the \\(mingw-w64 runtime\\|mingw-runtime\\) package" *.h) minwinbase.h omp.h swprintf.inl
touch $@
octave: octave64
--
GitLab