178 lines
7.1 KiB
Diff
178 lines
7.1 KiB
Diff
diff -Naur sed-4.2.2-orig/build-aux/config.guess sed-4.2.2/build-aux/config.guess
|
|
--- sed-4.2.2-orig/build-aux/config.guess 2012-12-22 17:22:08.000000000 +0400
|
|
+++ sed-4.2.2/build-aux/config.guess 2013-06-26 15:07:42.564453100 +0400
|
|
@@ -844,6 +844,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 sed-4.2.2-orig/build-aux/config.rpath sed-4.2.2/build-aux/config.rpath
|
|
--- sed-4.2.2-orig/build-aux/config.rpath 2010-11-01 17:31:30.000000000 +0300
|
|
+++ sed-4.2.2/build-aux/config.rpath 2013-06-26 15:08:13.283203100 +0400
|
|
@@ -64,7 +64,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- mingw* | cygwin* | pw32* | os2*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2*)
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
wl='-Wl,'
|
|
@@ -132,7 +132,7 @@
|
|
hardcode_minus_L=no
|
|
|
|
case "$host_os" in
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# 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++.
|
|
@@ -182,7 +182,7 @@
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
# no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -326,7 +326,7 @@
|
|
;;
|
|
bsdi[45]*)
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# When not using gcc, we currently assume that we are using
|
|
# Microsoft Visual C++.
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
@@ -517,7 +517,7 @@
|
|
bsdi[45]*)
|
|
library_names_spec='$libname$shrext'
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
shrext=.dll
|
|
library_names_spec='$libname.dll.a $libname.lib'
|
|
;;
|
|
diff -Naur sed-4.2.2-orig/configure.ac sed-4.2.2/configure.ac
|
|
--- sed-4.2.2-orig/configure.ac 2012-12-22 18:20:20.000000000 +0400
|
|
+++ sed-4.2.2/configure.ac 2013-06-26 15:05:55.548828100 +0400
|
|
@@ -34,7 +34,7 @@
|
|
}], [sed_cv_fopen_rt=yes],
|
|
[sed_cv_fopen_rt=no],
|
|
[case $host in
|
|
- *cygwin* | *mingw*) sed_cv_fopen_rt=yes ;;
|
|
+ *cygwin* | *msys* | *mingw*) sed_cv_fopen_rt=yes ;;
|
|
*) sed_cv_fopen_rt='assuming no' ;;
|
|
esac])])
|
|
if test "$sed_cv_fopen_rt" = yes; then
|
|
diff -Naur sed-4.2.2-orig/lib/gnulib.mk sed-4.2.2/lib/gnulib.mk
|
|
--- sed-4.2.2-orig/lib/gnulib.mk 2012-12-22 17:21:51.000000000 +0400
|
|
+++ sed-4.2.2/lib/gnulib.mk 2013-06-26 15:05:24.095703100 +0400
|
|
@@ -404,7 +404,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 sed-4.2.2-orig/lib/Makefile.in sed-4.2.2/lib/Makefile.in
|
|
--- sed-4.2.2-orig/lib/Makefile.in 2012-12-22 18:21:10.000000000 +0400
|
|
+++ sed-4.2.2/lib/Makefile.in 2013-06-26 15:05:24.126953100 +0400
|
|
@@ -1698,7 +1698,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 sed-4.2.2-orig/m4/btowc.m4 sed-4.2.2/m4/btowc.m4
|
|
--- sed-4.2.2-orig/m4/btowc.m4 2012-03-16 11:52:03.000000000 +0400
|
|
+++ sed-4.2.2/m4/btowc.m4 2013-06-26 15:11:58.689453100 +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 sed-4.2.2-orig/m4/double-slash-root.m4 sed-4.2.2/m4/double-slash-root.m4
|
|
--- sed-4.2.2-orig/m4/double-slash-root.m4 2012-03-16 11:52:03.000000000 +0400
|
|
+++ sed-4.2.2/m4/double-slash-root.m4 2013-06-26 15:12:19.705078100 +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 sed-4.2.2-orig/m4/malloc.m4 sed-4.2.2/m4/malloc.m4
|
|
--- sed-4.2.2-orig/m4/malloc.m4 2012-09-13 10:58:20.000000000 +0400
|
|
+++ sed-4.2.2/m4/malloc.m4 2013-06-26 15:12:41.423828100 +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 sed-4.2.2-orig/m4/realloc.m4 sed-4.2.2/m4/realloc.m4
|
|
--- sed-4.2.2-orig/m4/realloc.m4 2012-09-13 10:58:20.000000000 +0400
|
|
+++ sed-4.2.2/m4/realloc.m4 2013-06-26 15:12:57.283203100 +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 sed-4.2.2-orig/m4/threadlib.m4 sed-4.2.2/m4/threadlib.m4
|
|
--- sed-4.2.2-orig/m4/threadlib.m4 2012-09-13 10:58:20.000000000 +0400
|
|
+++ sed-4.2.2/m4/threadlib.m4 2013-06-26 15:13:15.205078100 +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 sed-4.2.2-orig/m4/wctob.m4 sed-4.2.2/m4/wctob.m4
|
|
--- sed-4.2.2-orig/m4/wctob.m4 2012-03-16 11:52:03.000000000 +0400
|
|
+++ sed-4.2.2/m4/wctob.m4 2013-06-26 15:13:35.064453100 +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>
|