Mercurial > mxe-octave
changeset 5871:1b10dc73d928
netcdf: add patch for msys2 filenames
* src/netcdf-1-fixes.patch: new file
* dist-files.mk: add ref to patch
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Wed, 01 Sep 2021 07:28:18 -0400 |
| parents | 9c858dd1990f |
| children | b0e9d3ec87cd |
| files | dist-files.mk src/netcdf-1-fixes.patch |
| diffstat | 2 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sun Aug 29 10:47:00 2021 -0400 +++ b/dist-files.mk Wed Sep 01 07:28:18 2021 -0400 @@ -458,6 +458,7 @@ native-gcc.mk \ ncurses-1-gcc-5-fix.patch \ ncurses.mk \ + netcdf-1-fixes.patch \ netcdf.mk \ nettle-1-fixes.patch \ nettle.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/netcdf-1-fixes.patch Wed Sep 01 07:28:18 2021 -0400 @@ -0,0 +1,22 @@ +From 9a8a2eb2694581f6caf103aee593ca9607be17bd Mon Sep 17 00:00:00 2001 +From: Milton Woods <miltonjwoods@gmail.com> +Date: Mon, 23 Aug 2021 14:22:57 +1000 +Subject: [PATCH] Fix path conversions for mingw-w64 + +--- + libdispatch/dpathmgr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libdispatch/dpathmgr.c b/libdispatch/dpathmgr.c +index eb450534e..6a5890423 100644 +--- a/libdispatch/dpathmgr.c ++++ b/libdispatch/dpathmgr.c +@@ -861,7 +861,7 @@ getlocalpathkind(void) + kind = NCPD_CYGWIN; + #elif __MSYS__ + kind = NCPD_MSYS; +-#elif _MSC_VER /* not _WIN32 */ ++#elif defined(_MSC_VER) || defined(__MINGW32__) /* not _WIN32 */ + kind = NCPD_WIN; + #else + kind = NCPD_NIX;