aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2019-11-09 20:45:46 +0200
committerArnold D. Robbins <arnold@skeeve.com>2019-11-09 20:45:46 +0200
commit2269a6d3fb4c7085d77a482f59562edeb12d0014 (patch)
treee14fb1d9ae784b0fbbe7baa9ce56c3f05fb865a9
parent43dcfbd0403563e7a1c8bfe4a67966df4840d90c (diff)
downloadegawk-2269a6d3fb4c7085d77a482f59562edeb12d0014.tar.gz
egawk-2269a6d3fb4c7085d77a482f59562edeb12d0014.tar.bz2
egawk-2269a6d3fb4c7085d77a482f59562edeb12d0014.zip
Add some MSYS2 support.
-rw-r--r--m4/ChangeLog4
-rw-r--r--m4/threadlib.m42
-rw-r--r--test/ChangeLog5
-rw-r--r--test/Makefile.am4
-rw-r--r--test/Makefile.in4
5 files changed, 14 insertions, 5 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index a4e8450c..3ed357db 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2019-11-09 Alexey Pawlow <alexey.pawlow@gmail.com>
+
+ * threadlib.m4: Add check for MSYS.
+
2019-09-10 Florian Weimer <fweimer@redhat.com>
* readline.m4 (GAWK_CHECK_READLINE): Include <fcntl.h>, <unistd.h>
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index dc9a3d8e..8b03a385 100644
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -68,7 +68,7 @@ changequote(,)dnl
dnl bugs that lead to endless loops or crashes. See
dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
osf*) gl_use_threads=no ;;
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
1.[0-5].*) gl_use_threads=no ;;
*) gl_use_threads=yes ;;
diff --git a/test/ChangeLog b/test/ChangeLog
index cd503c39..9ff97b2e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-09 Alexey Pawlow <alexey.pawlow@gmail.com>
+
+ * Makefile.am (mbprintf5): Add check for MSYS.
+ (readdir_retest): Ditto.
+
2019-11-03 Arnold D. Robbins <arnold@skeeve.com>
* Makefile.am (EXTRA_DISTS): New test, fpat7.
diff --git a/test/Makefile.am b/test/Makefile.am
index 84a71bc8..c6e33ddb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1949,7 +1949,7 @@ mixed1::
mbprintf5::
@echo $@ $(ZOS_FAIL)
@-case `uname` in \
- CYGWIN* | MINGW32* | *MS-DOS*) echo this test fails on this system --- skipping $@ ;; \
+ CYGWIN* | MSYS* | MINGW32* | *MS-DOS*) echo this test fails on this system --- skipping $@ ;; \
*) \
[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
$(AWK) -f "$(srcdir)"/$@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ ; \
@@ -2239,7 +2239,7 @@ fts:
IRIX) \
echo This test may fail on IRIX systems when run on an NFS filesystem.; \
echo If it does, try rerunning on an xfs filesystem. ;; \
- CYGWIN*) \
+ CYGWIN* | MSYS*) \
echo This test may fail on CYGWIN systems when run on an NFS filesystem.; \
echo If it does, try rerunning on an ntfs filesystem. ;; \
esac
diff --git a/test/Makefile.in b/test/Makefile.in
index 7bbacf1a..52b487b6 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2398,7 +2398,7 @@ mixed1::
mbprintf5::
@echo $@ $(ZOS_FAIL)
@-case `uname` in \
- CYGWIN* | MINGW32* | *MS-DOS*) echo this test fails on this system --- skipping $@ ;; \
+ CYGWIN* | MSYS* | MINGW32* | *MS-DOS*) echo this test fails on this system --- skipping $@ ;; \
*) \
[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE ; \
$(AWK) -f "$(srcdir)"/$@.awk "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >> _$@ ; \
@@ -2688,7 +2688,7 @@ fts:
IRIX) \
echo This test may fail on IRIX systems when run on an NFS filesystem.; \
echo If it does, try rerunning on an xfs filesystem. ;; \
- CYGWIN*) \
+ CYGWIN* | MSYS*) \
echo This test may fail on CYGWIN systems when run on an NFS filesystem.; \
echo If it does, try rerunning on an ntfs filesystem. ;; \
esac