Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
cb8564b6771e2dbcbb07fa81ab1dcae109ac3cfd
MSYS2-packages/gettext/gettext-0.18.3.1-msys2.patch
Alexpux 7832240026 gettext: Update to 0.19.4
2015-03-03 14:20:22 +03:00

470 lines
22 KiB
Diff
Raw Blame History

diff -Naur gettext-0.18.3.1-orig/build-aux/compile gettext-0.18.3.1/build-aux/compile
--- gettext-0.18.3.1-orig/build-aux/compile 2013-08-15 20:26:40.000000000 +0400
+++ gettext-0.18.3.1/build-aux/compile 2013-09-03 07:33:18.794921900 +0400
@@ -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 gettext-0.18.3.1-orig/build-aux/config.guess gettext-0.18.3.1/build-aux/config.guess
--- gettext-0.18.3.1-orig/build-aux/config.guess 2013-08-15 20:26:24.000000000 +0400
+++ gettext-0.18.3.1/build-aux/config.guess 2013-09-03 07:35:19.779296900 +0400
@@ -866,6 +866,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 gettext-0.18.3.1-orig/build-aux/config.libpath gettext-0.18.3.1/build-aux/config.libpath
--- gettext-0.18.3.1-orig/build-aux/config.libpath 2013-08-15 20:23:59.000000000 +0400
+++ gettext-0.18.3.1/build-aux/config.libpath 2013-09-03 07:33:18.794921900 +0400
@@ -56,7 +56,7 @@
bsdi[45]*)
shlibpath_var=LD_LIBRARY_PATH
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
diff -Naur gettext-0.18.3.1-orig/build-aux/config.rpath gettext-0.18.3.1/build-aux/config.rpath
--- gettext-0.18.3.1-orig/build-aux/config.rpath 2013-08-15 20:23:59.000000000 +0400
+++ gettext-0.18.3.1/build-aux/config.rpath 2013-09-03 07:33:18.794921900 +0400
@@ -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
@@ -537,7 +537,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 gettext-0.18.3.1-orig/gettext-runtime/configure.ac gettext-0.18.3.1/gettext-runtime/configure.ac
--- gettext-0.18.3.1-orig/gettext-runtime/configure.ac 2013-07-29 15:35:59.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/configure.ac 2013-09-03 07:33:18.841796900 +0400
@@ -75,7 +75,7 @@
dnl On mingw and Cygwin, we can activate special Makefile rules which add
dnl version information to the shared libraries and executables.
case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
+ mingw* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
@@ -115,7 +115,7 @@
dnl exported variables _also_ in the static library.
if test "$enable_shared" = yes; then
case "$host_os" in
- mingw* | cygwin*) is_woe32dll=yes ;;
+ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
*) is_woe32dll=no ;;
esac
else
diff -Naur gettext-0.18.3.1-orig/gettext-runtime/gnulib-lib/Makefile.am gettext-0.18.3.1/gettext-runtime/gnulib-lib/Makefile.am
--- gettext-0.18.3.1-orig/gettext-runtime/gnulib-lib/Makefile.am 2013-08-15 20:24:07.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/gnulib-lib/Makefile.am 2013-09-03 07:33:18.857421900 +0400
@@ -415,7 +415,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 gettext-0.18.3.1-orig/gettext-runtime/gnulib-m4/double-slash-root.m4 gettext-0.18.3.1/gettext-runtime/gnulib-m4/double-slash-root.m4
--- gettext-0.18.3.1-orig/gettext-runtime/gnulib-m4/double-slash-root.m4 2013-08-15 20:24:01.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/gnulib-m4/double-slash-root.m4 2013-09-03 07:33:18.857421900 +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 gettext-0.18.3.1-orig/gettext-runtime/gnulib-m4/setlocale.m4 gettext-0.18.3.1/gettext-runtime/gnulib-m4/setlocale.m4
--- gettext-0.18.3.1-orig/gettext-runtime/gnulib-m4/setlocale.m4 2013-08-15 20:24:02.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/gnulib-m4/setlocale.m4 2013-09-03 07:33:18.857421900 +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 gettext-0.18.3.1-orig/gettext-runtime/libasprintf/configure.ac gettext-0.18.3.1/gettext-runtime/libasprintf/configure.ac
--- gettext-0.18.3.1-orig/gettext-runtime/libasprintf/configure.ac 2013-07-29 15:35:45.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/libasprintf/configure.ac 2013-09-03 07:33:18.888671900 +0400
@@ -44,7 +44,7 @@
case "$host_os" in
# On Cygwin, without -no-undefined, a warning is emitted and only a static
# library is built.
- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
+ beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
*) LTNOUNDEF='' ;;
esac
AC_SUBST([LTNOUNDEF])
diff -Naur gettext-0.18.3.1-orig/gettext-runtime/m4/intl.m4 gettext-0.18.3.1/gettext-runtime/m4/intl.m4
--- gettext-0.18.3.1-orig/gettext-runtime/m4/intl.m4 2013-08-12 16:07:22.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/m4/intl.m4 2013-09-03 07:33:18.888671900 +0400
@@ -111,7 +111,7 @@
dnl exported variables _also_ in the static library.
if test "$enable_shared" = yes; then
case "$host_os" in
- mingw* | cygwin*) is_woe32dll=yes ;;
+ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
*) is_woe32dll=no ;;
esac
else
@@ -123,7 +123,7 @@
dnl On mingw and Cygwin, we can activate special Makefile rules which add
dnl version information to the shared libraries and executables.
case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
+ mingw* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
WOE32=$is_woe32
diff -Naur gettext-0.18.3.1-orig/gettext-runtime/m4/threadlib.m4 gettext-0.18.3.1/gettext-runtime/m4/threadlib.m4
--- gettext-0.18.3.1-orig/gettext-runtime/m4/threadlib.m4 2013-07-29 15:35:59.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/m4/threadlib.m4 2013-09-03 07:33:18.888671900 +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 gettext-0.18.3.1-orig/gettext-tools/configure.ac gettext-0.18.3.1/gettext-tools/configure.ac
--- gettext-0.18.3.1-orig/gettext-tools/configure.ac 2013-08-15 20:15:56.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/configure.ac 2013-09-03 07:33:18.919921900 +0400
@@ -109,7 +109,7 @@
dnl Cygwin DLL. To avoid any conflict with gettext DLLs, always link
dnl to gnulib's error.c. See GETTEXTLIB_EXPORTS_FLAGS setting below.
case "$host_os" in
- cygwin*) ac_cv_lib_error_at_line=no ;;
+ cygwin* | msys*) ac_cv_lib_error_at_line=no ;;
esac
dnl Checks for libraries.
diff -Naur gettext-0.18.3.1-orig/gettext-tools/examples/hello-c++-kde/admin/config.guess gettext-0.18.3.1/gettext-tools/examples/hello-c++-kde/admin/config.guess
--- gettext-0.18.3.1-orig/gettext-tools/examples/hello-c++-kde/admin/config.guess 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/examples/hello-c++-kde/admin/config.guess 2013-09-03 07:33:18.919921900 +0400
@@ -762,6 +762,9 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit 0 ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit 0 ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
diff -Naur gettext-0.18.3.1-orig/gettext-tools/examples/hello-c++-kde/admin/config.sub gettext-0.18.3.1/gettext-tools/examples/hello-c++-kde/admin/config.sub
--- gettext-0.18.3.1-orig/gettext-tools/examples/hello-c++-kde/admin/config.sub 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/examples/hello-c++-kde/admin/config.sub 2013-09-03 07:33:18.935546900 +0400
@@ -1111,7 +1111,7 @@
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff -Naur gettext-0.18.3.1-orig/gettext-tools/gnulib-lib/Makefile.gnulib gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile.gnulib
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-lib/Makefile.gnulib 2013-08-15 20:25:23.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile.gnulib 2013-09-03 07:33:18.935546900 +0400
@@ -1655,7 +1655,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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/btowc.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/btowc.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/btowc.m4 2013-08-15 20:25:02.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/btowc.m4 2013-09-03 07:41:27.216796900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/csharpexec.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/csharpexec.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/csharpexec.m4 2013-08-15 20:25:02.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/csharpexec.m4 2013-09-03 07:33:18.935546900 +0400
@@ -53,7 +53,7 @@
ifelse([$1], , , [&& clix $2/$1 >/dev/null 2>/dev/null]); then
HAVE_CLIX=1
case $host_os in
- cygwin* | mingw* | pw32*)
+ cygwin* | msys* | mingw* | pw32*)
CLIX_PATH_VAR=PATH
;;
darwin* | rhapsody*)
diff -Naur gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/double-slash-root.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/double-slash-root.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/double-slash-root.m4 2013-08-15 20:25:02.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/double-slash-root.m4 2013-09-03 07:33:18.951171900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/dup2.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/dup2.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/dup2.m4 2013-08-15 20:25:02.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/dup2.m4 2013-09-03 07:33:18.951171900 +0400
@@ -49,7 +49,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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/getcwd.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/getcwd.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/getcwd.m4 2013-08-15 20:25:02.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/getcwd.m4 2013-09-03 07:33:18.951171900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/malloc.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/malloc.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/malloc.m4 2013-08-15 20:25:03.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/malloc.m4 2013-09-03 07:33:18.951171900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/printf.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/printf.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/printf.m4 2013-08-15 20:25:03.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/printf.m4 2013-09-03 07:33:18.951171900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/realloc.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/realloc.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/realloc.m4 2013-08-15 20:25:03.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/realloc.m4 2013-09-03 07:33:18.951171900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/setlocale.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/setlocale.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/setlocale.m4 2013-08-15 20:25:03.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/setlocale.m4 2013-09-03 07:33:18.951171900 +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 gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/wctob.m4 gettext-0.18.3.1/gettext-tools/gnulib-m4/wctob.m4
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-m4/wctob.m4 2013-08-15 20:25:04.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-m4/wctob.m4 2013-09-03 07:33:18.966796900 +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>
diff -Naur gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-copy-acl.sh gettext-0.18.3.1/gettext-tools/gnulib-tests/test-copy-acl.sh
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-copy-acl.sh 2013-08-15 20:25:04.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-tests/test-copy-acl.sh 2013-09-03 07:33:18.966796900 +0400
@@ -128,7 +128,7 @@
# the programs.
# func_test_same_acls file1 file2
case $acl_flavor in
- linux | cygwin | freebsd | solaris)
+ linux | cygwin | msys | freebsd | solaris)
func_test_same_acls ()
{
getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
@@ -302,7 +302,7 @@
;;
- cygwin)
+ cygwin | msys)
# Set an ACL for a group.
setfacl -m group:0:1 tmpfile0
diff -Naur gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-copy-file.sh gettext-0.18.3.1/gettext-tools/gnulib-tests/test-copy-file.sh
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-copy-file.sh 2013-08-15 20:25:04.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-tests/test-copy-file.sh 2013-09-03 07:33:18.966796900 +0400
@@ -122,7 +122,7 @@
# the programs.
# func_test_same_acls file1 file2
case $acl_flavor in
- linux | cygwin | freebsd | solaris)
+ linux | cygwin | msys | freebsd | solaris)
func_test_same_acls ()
{
getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1
@@ -296,7 +296,7 @@
;;
- cygwin)
+ cygwin | msys)
# Set an ACL for a group.
setfacl -m group:0:1 tmpfile0
diff -Naur gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-file-has-acl.sh gettext-0.18.3.1/gettext-tools/gnulib-tests/test-file-has-acl.sh
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-file-has-acl.sh 2013-08-15 20:25:05.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-tests/test-file-has-acl.sh 2013-09-03 07:33:18.966796900 +0400
@@ -247,7 +247,7 @@
fi
;;
- cygwin)
+ cygwin | msys)
# Set an ACL for a group.
if setfacl -m group:0:1 tmpfile0; then
diff -Naur gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-set-mode-acl.sh gettext-0.18.3.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-tests/test-set-mode-acl.sh 2013-08-15 20:25:06.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh 2013-09-03 07:33:18.966796900 +0400
@@ -177,7 +177,7 @@
linux | freebsd | solaris)
setfacl -m user:$auid:1 tmpfile0
;;
- cygwin)
+ cygwin | msys)
setfacl -m group:0:1 tmpfile0
;;
hpux)
diff -Naur gettext-0.18.3.1-orig/gettext-tools/libgettextpo/Makefile.gnulib gettext-0.18.3.1/gettext-tools/libgettextpo/Makefile.gnulib
--- gettext-0.18.3.1-orig/gettext-tools/libgettextpo/Makefile.gnulib 2013-08-15 20:26:17.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/libgettextpo/Makefile.gnulib 2013-09-03 07:33:18.966796900 +0400
@@ -512,7 +512,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 ;; \
Reference in New Issue View Git Blame Copy Permalink