Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
MSYS2-packages/grep/grep-2.23-msys2.patch
Alexey 57d0858a76 Revert "grep: Update to 3.6" 
This reverts commit 990d969e1e35f260fc77afc92f6671199fd2f7c6.
2021-10-17 10:11:49 +03:00

298 lines
12 KiB
Diff
Raw Blame History

diff -Naur grep-2.23-orig/build-aux/ar-lib grep-2.23/build-aux/ar-lib
--- grep-2.23-orig/build-aux/ar-lib 2016-02-04 23:08:58.000000000 +0300
+++ grep-2.23/build-aux/ar-lib 2016-03-30 08:53:45.525087200 +0300
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN*|MSYS*)
file_conv=cygwin
;;
*)
@@ -65,7 +65,7 @@
mingw)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin)
+ cygwin|msys)
file=`cygpath -m "$file" || echo "$file"`
;;
wine)
diff -Naur grep-2.23-orig/build-aux/compile grep-2.23/build-aux/compile
--- grep-2.23-orig/build-aux/compile 2016-02-04 23:08:58.000000000 +0300
+++ grep-2.23/build-aux/compile 2016-03-30 08:53:21.190520900 +0300
@@ -53,7 +53,7 @@
MINGW*)
file_conv=mingw
;;
- CYGWIN*)
+ CYGWIN*|MSYS*)
file_conv=cygwin
;;
*)
@@ -67,7 +67,7 @@
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
- cygwin/*)
+ cygwin/*|msys/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
diff -Naur grep-2.23-orig/build-aux/config.guess grep-2.23/build-aux/config.guess
--- grep-2.23-orig/build-aux/config.guess 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/build-aux/config.guess 2016-03-30 08:53:21.207519200 +0300
@@ -884,6 +884,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+ echo x86_64-unknown-msys
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit ;;
diff -Naur grep-2.23-orig/build-aux/config.rpath grep-2.23/build-aux/config.rpath
--- grep-2.23-orig/build-aux/config.rpath 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/build-aux/config.rpath 2016-03-30 08:53:21.249515000 +0300
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -198,7 +198,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -348,7 +348,7 @@
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -533,7 +533,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur grep-2.23-orig/lib/gnulib.mk grep-2.23/lib/gnulib.mk
--- grep-2.23-orig/lib/gnulib.mk 2016-01-28 11:00:43.000000000 +0300
+++ grep-2.23/lib/gnulib.mk 2016-03-30 08:53:21.281511800 +0300
@@ -970,7 +970,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.23-orig/lib/Makefile.in grep-2.23/lib/Makefile.in
--- grep-2.23-orig/lib/Makefile.in 2016-02-04 23:08:58.000000000 +0300
+++ grep-2.23/lib/Makefile.in 2016-03-30 08:53:21.309509000 +0300
@@ -2501,7 +2501,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.23-orig/m4/btowc.m4 grep-2.23/m4/btowc.m4
--- grep-2.23-orig/m4/btowc.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/btowc.m4 2016-03-30 08:53:21.347505200 +0300
@@ -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.23-orig/m4/double-slash-root.m4 grep-2.23/m4/double-slash-root.m4
--- grep-2.23-orig/m4/double-slash-root.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/double-slash-root.m4 2016-03-30 08:53:21.376502300 +0300
@@ -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.23-orig/m4/dup2.m4 grep-2.23/m4/dup2.m4
--- grep-2.23-orig/m4/dup2.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/dup2.m4 2016-03-30 08:53:21.403499600 +0300
@@ -78,7 +78,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" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
diff -Naur grep-2.23-orig/m4/fcntl.m4 grep-2.23/m4/fcntl.m4
--- grep-2.23-orig/m4/fcntl.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/fcntl.m4 2016-03-30 08:54:28.942745000 +0300
@@ -69,7 +69,7 @@
[gl_cv_func_fcntl_f_dupfd_works=yes],
[gl_cv_func_fcntl_f_dupfd_works=no],
[case $host_os in
- aix* | cygwin* | haiku*)
+ aix* | cygwin* | msys* | haiku*)
gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
*) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
esac])])
diff -Naur grep-2.23-orig/m4/getcwd.m4 grep-2.23/m4/getcwd.m4
--- grep-2.23-orig/m4/getcwd.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/getcwd.m4 2016-03-30 08:53:21.438496100 +0300
@@ -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.23-orig/m4/getdtablesize.m4 grep-2.23/m4/getdtablesize.m4
--- grep-2.23-orig/m4/getdtablesize.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/getdtablesize.m4 2016-03-30 08:53:21.460493900 +0300
@@ -28,7 +28,7 @@
[gl_cv_func_getdtablesize_works=yes],
[gl_cv_func_getdtablesize_works=no],
[case "$host_os" in
- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows
gl_cv_func_getdtablesize_works="guessing no" ;;
*) gl_cv_func_getdtablesize_works="guessing yes" ;;
esac])
diff -Naur grep-2.23-orig/m4/malloc.m4 grep-2.23/m4/malloc.m4
--- grep-2.23-orig/m4/malloc.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/malloc.m4 2016-03-30 08:53:21.500489900 +0300
@@ -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.23-orig/m4/printf.m4 grep-2.23/m4/printf.m4
--- grep-2.23-orig/m4/printf.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/printf.m4 2016-03-30 08:53:21.528487100 +0300
@@ -720,7 +720,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
@@ -797,7 +797,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";;
@@ -1449,7 +1449,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.23-orig/m4/realloc.m4 grep-2.23/m4/realloc.m4
--- grep-2.23-orig/m4/realloc.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/realloc.m4 2016-03-30 08:53:21.560483900 +0300
@@ -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.23-orig/m4/setlocale.m4 grep-2.23/m4/setlocale.m4
--- grep-2.23-orig/m4/setlocale.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/setlocale.m4 2016-03-30 08:53:21.578482100 +0300
@@ -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.23-orig/m4/threadlib.m4 grep-2.23/m4/threadlib.m4
--- grep-2.23-orig/m4/threadlib.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/threadlib.m4 2016-03-30 08:53:21.606479300 +0300
@@ -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.23-orig/m4/wctob.m4 grep-2.23/m4/wctob.m4
--- grep-2.23-orig/m4/wctob.m4 2016-02-03 08:46:26.000000000 +0300
+++ grep-2.23/m4/wctob.m4 2016-03-30 08:53:21.651474800 +0300
@@ -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>
Reference in New Issue View Git Blame Copy Permalink