280 lines
13 KiB
Diff
280 lines
13 KiB
Diff
diff -Naur grep-2.14/configure grep-2.14m/configure
|
|
--- grep-2.14/configure 2012-08-20 10:12:13.000000000 +0400
|
|
+++ grep-2.14m/configure 2013-02-24 15:43:58.000000000 +0400
|
|
@@ -6585,7 +6459,7 @@
|
|
else
|
|
case "$host_os" in
|
|
osf*) gl_use_threads=no ;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
case `uname -r` in
|
|
1.[0-5].*) gl_use_threads=no ;;
|
|
*) gl_use_threads=yes ;;
|
|
@@ -8105,7 +7971,7 @@
|
|
# special semantics and is distinct from /, please report it to
|
|
# <bug-gnulib@gnu.org>.
|
|
case $host in
|
|
- *-cygwin | i370-ibm-openedition)
|
|
+ *-cygwin | *-msys | i370-ibm-openedition)
|
|
gl_cv_double_slash_root=yes ;;
|
|
*)
|
|
# Be optimistic and assume that / and // are the same when we
|
|
@@ -9307,7 +9173,7 @@
|
|
# Guess yes on glibc systems.
|
|
*-gnu*) gl_cv_func_getcwd_null="guessing yes";;
|
|
# Guess yes on Cygwin.
|
|
- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
|
|
+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
|
|
# If we don't know, assume the worst.
|
|
*) gl_cv_func_getcwd_null="guessing no";;
|
|
esac
|
|
@@ -13067,7 +12933,7 @@
|
|
case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
|
ac_cv_func_malloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_malloc_0_nonnull=no ;;
|
|
@@ -17474,7 +17340,7 @@
|
|
|
|
case "$host_os" in
|
|
# Guess no on Cygwin.
|
|
- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
|
|
+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
|
|
# Guess yes otherwise.
|
|
*) gl_cv_func_btowc_nul="guessing yes" ;;
|
|
esac
|
|
@@ -18420,7 +18286,7 @@
|
|
# special semantics and is distinct from /, please report it to
|
|
# <bug-gnulib@gnu.org>.
|
|
case $host in
|
|
- *-cygwin | i370-ibm-openedition)
|
|
+ *-cygwin | *-msys | i370-ibm-openedition)
|
|
gl_cv_double_slash_root=yes ;;
|
|
*)
|
|
# Be optimistic and assume that / and // are the same when we
|
|
@@ -18517,7 +18383,7 @@
|
|
case "$host_os" in
|
|
mingw*) # on this platform, dup2 always returns 0 for success
|
|
gl_cv_func_dup2_works="guessing no" ;;
|
|
- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
|
|
+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
|
|
gl_cv_func_dup2_works="guessing no" ;;
|
|
linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
|
|
# closed fd may yield -EBADF instead of -1 / errno=EBADF.
|
|
@@ -21560,7 +21426,7 @@
|
|
case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
|
ac_cv_func_malloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_malloc_0_nonnull=no ;;
|
|
@@ -23854,7 +23720,7 @@
|
|
case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
|
ac_cv_func_realloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_realloc_0_nonnull=no ;;
|
|
@@ -26780,13 +26646,13 @@
|
|
|
|
case "$host_os" in
|
|
# Guess no on Solaris <= 9 and Cygwin.
|
|
- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
|
|
+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
|
|
gl_cv_func_wctob_works="guessing no" ;;
|
|
# Guess yes otherwise.
|
|
*) gl_cv_func_wctob_works="guessing yes" ;;
|
|
esac
|
|
case "$host_os" in
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
if test "$cross_compiling" = yes; then :
|
|
:
|
|
else
|
|
@@ -30730,7 +30596,7 @@
|
|
|
|
case "$host_os" in
|
|
mingw*) REPLACE_SETLOCALE=1 ;;
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
case `uname -r` in
|
|
1.5.*) REPLACE_SETLOCALE=1 ;;
|
|
esac
|
|
diff -Naur grep-2.14/lib/gnulib.mk grep-2.14m/lib/gnulib.mk
|
|
--- grep-2.14/lib/gnulib.mk 2012-08-06 19:20:53.000000000 +0400
|
|
+++ grep-2.14m/lib/gnulib.mk 2013-02-24 15:31:36.000000000 +0400
|
|
@@ -933,7 +933,7 @@
|
|
case '$(host_os)' in \
|
|
darwin[56]*) \
|
|
need_charset_alias=true ;; \
|
|
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
|
|
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
|
|
need_charset_alias=false ;; \
|
|
*) \
|
|
need_charset_alias=true ;; \
|
|
diff -Naur grep-2.14/lib/Makefile.in grep-2.14m/lib/Makefile.in
|
|
--- grep-2.14/lib/Makefile.in 2012-08-17 09:43:49.000000000 +0400
|
|
+++ grep-2.14m/lib/Makefile.in 2013-02-24 15:44:14.000000000 +0400
|
|
@@ -2047,7 +2044,7 @@
|
|
case '$(host_os)' in \
|
|
darwin[56]*) \
|
|
need_charset_alias=true ;; \
|
|
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
|
|
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
|
|
need_charset_alias=false ;; \
|
|
*) \
|
|
need_charset_alias=true ;; \
|
|
diff -Naur grep-2.14/m4/btowc.m4 grep-2.14m/m4/btowc.m4
|
|
--- grep-2.14/m4/btowc.m4 2012-01-07 19:36:03.000000000 +0400
|
|
+++ grep-2.14m/m4/btowc.m4 2013-02-24 15:32:22.000000000 +0400
|
|
@@ -49,7 +49,7 @@
|
|
changequote(,)dnl
|
|
case "$host_os" in
|
|
# Guess no on Cygwin.
|
|
- cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
|
|
+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;;
|
|
# Guess yes otherwise.
|
|
*) gl_cv_func_btowc_nul="guessing yes" ;;
|
|
esac
|
|
diff -Naur grep-2.14/m4/double-slash-root.m4 grep-2.14m/m4/double-slash-root.m4
|
|
--- grep-2.14/m4/double-slash-root.m4 2012-01-07 19:36:03.000000000 +0400
|
|
+++ grep-2.14m/m4/double-slash-root.m4 2013-02-24 15:32:36.000000000 +0400
|
|
@@ -16,7 +16,7 @@
|
|
# special semantics and is distinct from /, please report it to
|
|
# <bug-gnulib@gnu.org>.
|
|
case $host in
|
|
- *-cygwin | i370-ibm-openedition)
|
|
+ *-cygwin | *-msys | i370-ibm-openedition)
|
|
gl_cv_double_slash_root=yes ;;
|
|
*)
|
|
# Be optimistic and assume that / and // are the same when we
|
|
diff -Naur grep-2.14/m4/dup2.m4 grep-2.14m/m4/dup2.m4
|
|
--- grep-2.14/m4/dup2.m4 2012-06-03 11:19:16.000000000 +0400
|
|
+++ grep-2.14m/m4/dup2.m4 2013-02-24 15:32:54.000000000 +0400
|
|
@@ -46,7 +46,7 @@
|
|
[case "$host_os" in
|
|
mingw*) # on this platform, dup2 always returns 0 for success
|
|
gl_cv_func_dup2_works="guessing no" ;;
|
|
- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
|
|
+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
|
|
gl_cv_func_dup2_works="guessing no" ;;
|
|
linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
|
|
# closed fd may yield -EBADF instead of -1 / errno=EBADF.
|
|
diff -Naur grep-2.14/m4/getcwd.m4 grep-2.14m/m4/getcwd.m4
|
|
--- grep-2.14/m4/getcwd.m4 2012-06-03 11:19:16.000000000 +0400
|
|
+++ grep-2.14m/m4/getcwd.m4 2013-02-24 15:33:13.000000000 +0400
|
|
@@ -49,7 +49,7 @@
|
|
# Guess yes on glibc systems.
|
|
*-gnu*) gl_cv_func_getcwd_null="guessing yes";;
|
|
# Guess yes on Cygwin.
|
|
- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
|
|
+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";;
|
|
# If we don't know, assume the worst.
|
|
*) gl_cv_func_getcwd_null="guessing no";;
|
|
esac
|
|
diff -Naur grep-2.14/m4/malloc.m4 grep-2.14m/m4/malloc.m4
|
|
--- grep-2.14/m4/malloc.m4 2012-06-03 11:19:16.000000000 +0400
|
|
+++ grep-2.14m/m4/malloc.m4 2013-02-24 15:33:48.000000000 +0400
|
|
@@ -30,7 +30,7 @@
|
|
[case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
|
ac_cv_func_malloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_malloc_0_nonnull=no ;;
|
|
diff -Naur grep-2.14/m4/printf.m4 grep-2.14m/m4/printf.m4
|
|
--- grep-2.14/m4/printf.m4 2012-07-03 16:53:22.000000000 +0400
|
|
+++ grep-2.14m/m4/printf.m4 2013-02-24 15:34:21.000000000 +0400
|
|
@@ -735,7 +735,7 @@
|
|
openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
|
|
irix*) gl_cv_func_printf_directive_ls="guessing no";;
|
|
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
|
|
- cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
|
|
+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";;
|
|
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
|
|
*) gl_cv_func_printf_directive_ls="guessing yes";;
|
|
esac
|
|
@@ -812,7 +812,7 @@
|
|
[
|
|
changequote(,)dnl
|
|
case "$host_os" in
|
|
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
|
|
+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";;
|
|
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
|
|
mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
|
|
*) gl_cv_func_printf_flag_grouping="guessing yes";;
|
|
@@ -1464,7 +1464,7 @@
|
|
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
|
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
|
# Guess yes on Cygwin.
|
|
- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
|
+ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
|
# Guess yes on Solaris >= 2.6.
|
|
solaris2.[0-5] | solaris2.[0-5].*)
|
|
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
|
diff -Naur grep-2.14/m4/realloc.m4 grep-2.14m/m4/realloc.m4
|
|
--- grep-2.14/m4/realloc.m4 2012-06-03 11:19:16.000000000 +0400
|
|
+++ grep-2.14m/m4/realloc.m4 2013-02-24 15:34:41.000000000 +0400
|
|
@@ -30,7 +30,7 @@
|
|
[case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
|
ac_cv_func_realloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_realloc_0_nonnull=no ;;
|
|
diff -Naur grep-2.14/m4/setlocale.m4 grep-2.14m/m4/setlocale.m4
|
|
--- grep-2.14/m4/setlocale.m4 2012-01-07 19:36:03.000000000 +0400
|
|
+++ grep-2.14m/m4/setlocale.m4 2013-02-24 15:34:55.000000000 +0400
|
|
@@ -14,7 +14,7 @@
|
|
mingw*) REPLACE_SETLOCALE=1 ;;
|
|
dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
|
|
dnl is then still "C".
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
case `uname -r` in
|
|
1.5.*) REPLACE_SETLOCALE=1 ;;
|
|
esac
|
|
diff -Naur grep-2.14/m4/threadlib.m4 grep-2.14m/m4/threadlib.m4
|
|
--- grep-2.14/m4/threadlib.m4 2012-07-03 16:53:22.000000000 +0400
|
|
+++ grep-2.14m/m4/threadlib.m4 2013-02-24 15:35:13.000000000 +0400
|
|
@@ -68,7 +68,7 @@
|
|
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 -Naur grep-2.14/m4/wctob.m4 grep-2.14m/m4/wctob.m4
|
|
--- grep-2.14/m4/wctob.m4 2012-01-07 19:36:03.000000000 +0400
|
|
+++ grep-2.14m/m4/wctob.m4 2013-02-24 15:35:36.000000000 +0400
|
|
@@ -29,14 +29,14 @@
|
|
changequote(,)dnl
|
|
case "$host_os" in
|
|
# Guess no on Solaris <= 9 and Cygwin.
|
|
- solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
|
|
+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
|
|
gl_cv_func_wctob_works="guessing no" ;;
|
|
# Guess yes otherwise.
|
|
*) gl_cv_func_wctob_works="guessing yes" ;;
|
|
esac
|
|
changequote([,])dnl
|
|
case "$host_os" in
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
AC_RUN_IFELSE(
|
|
[AC_LANG_SOURCE([[
|
|
#include <locale.h>
|