Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
2ca8a20a0cbdfeef638d243df010276cf1edb6ec
MSYS2-packages/gettext/gettext-0.18.3.1-msys2.patch
Alexpux af09fe1f90 Add gettext package
2013-11-01 06:56:15 +04:00

2019 lines
76 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/build-aux/ltmain.sh gettext-0.18.3.1/build-aux/ltmain.sh
--- gettext-0.18.3.1-orig/build-aux/ltmain.sh 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/build-aux/ltmain.sh 2013-09-03 07:33:18.810546900 +0400
@@ -1180,7 +1180,7 @@
test "$opt_debug" = : || func_append preserve_args " --debug"
case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -2123,7 +2123,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
- cygwin* | mingw* | pw32* | os2* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
pic_mode=default
;;
esac
@@ -2992,7 +2992,7 @@
'exit $?'
tstripme="$stripme"
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
tstripme=""
@@ -3098,7 +3098,7 @@
# Do a test to see if this is really a libtool program.
case $host in
- *cygwin* | *mingw*)
+ *cygwin* | *msys* | *mingw*)
if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result
@@ -3173,7 +3173,7 @@
# remove .exe since cygwin /usr/bin/install will append another
# one anyway
case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
case $file:$destfile in
*.exe:*.exe)
# this is ok
@@ -3323,7 +3323,7 @@
$RM $export_symbols
eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;;
@@ -3335,7 +3335,7 @@
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -3349,7 +3349,7 @@
func_basename "$dlprefile"
name="$func_basename_result"
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
@@ -3502,7 +3502,7 @@
# Transform the symbol file into the correct name.
symfileobj="$output_objdir/${my_outputname}S.$objext"
case $host in
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -4375,7 +4375,7 @@
{
EOF
case "$host" in
- *mingw* | *cygwin* )
+ *mingw* | *cygwin* | *msys* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
;;
@@ -5094,7 +5094,7 @@
{
$opt_debug
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
# which system we are compiling for in order to pass an extra
@@ -5581,7 +5581,7 @@
;;
esac
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
@@ -5601,7 +5601,7 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5679,7 +5679,7 @@
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
func_warning "\`-no-install' is ignored for $host"
@@ -6545,7 +6545,7 @@
fi
case "$host" in
# special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
# static and shared are present. Therefore, ensure we extract
# symbols from the import library if a shared library is present
@@ -6689,7 +6689,7 @@
if test -n "$library_names" &&
{ test "$use_static_libs" = no || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *msys* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -6759,7 +6759,7 @@
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | *msys* | mingw* | *cegcc*)
func_arith $current - $age
major=$func_arith_result
versuffix="-$major"
@@ -7620,7 +7620,7 @@
if test "$build_libtool_libs" = yes; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8134,7 +8134,7 @@
orig_export_symbols=
case $host_os in
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
@@ -8690,7 +8690,7 @@
prog)
case $host in
- *cygwin*) func_stripname '' '.exe' "$output"
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
@@ -8803,7 +8803,7 @@
esac
fi
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -8881,7 +8881,7 @@
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=no
;;
- *cygwin* | *mingw* )
+ *cygwin* | *msys* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
@@ -9028,14 +9028,14 @@
esac
# test for cygwin because mv fails w/o .exe extensions
case $host in
- *cygwin*)
+ *cygwin* | *msys*)
exeext=.exe
func_stripname '' '.exe' "$outputname"
outputname=$func_stripname_result ;;
*) exeext= ;;
esac
case $host in
- *cygwin* | *mingw* )
+ *cygwin* | *msys* | *mingw* )
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -9365,7 +9365,7 @@
# tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
if test "x$bindir" != x ;
then
diff -Naur gettext-0.18.3.1-orig/gettext-runtime/configure gettext-0.18.3.1/gettext-runtime/configure
--- gettext-0.18.3.1-orig/gettext-runtime/configure 2013-08-15 20:26:38.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/configure 2013-09-03 07:33:18.841796900 +0400
@@ -6931,7 +6931,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 ;;
@@ -7086,7 +7086,7 @@
case "$host_os" in
- mingw* | cygwin*)
+ mingw*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
$as_echo_n "checking for auto-import of symbols... " >&6; }
if ${gl_cv_ld_autoimport+:} false; then :
@@ -7740,7 +7740,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -7929,7 +7929,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -7937,12 +7937,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -8008,7 +8008,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
if test "$GCC" != yes; then
reload_cmds=false
fi
@@ -8163,7 +8163,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -8481,7 +8481,7 @@
lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh
# decide which to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -8973,7 +8973,7 @@
aix*)
symcode='[BCDT]'
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -10235,7 +10235,7 @@
enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -11094,7 +11094,7 @@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -11178,7 +11178,7 @@
fi
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -11669,7 +11669,7 @@
extract_expsyms_cmds=
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++.
@@ -11784,7 +11784,7 @@
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -12241,7 +12241,7 @@
export_dynamic_flag_spec=-rdynamic
;;
- 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
@@ -13194,7 +13194,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
@@ -13226,6 +13226,12 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -13260,7 +13266,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -13921,7 +13927,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen_libs=
;;
@@ -14713,7 +14719,7 @@
case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
+ mingw* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
if test $is_woe32 = yes; then
@@ -18802,7 +18808,7 @@
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
@@ -18812,7 +18818,7 @@
case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
+ mingw* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
WOE32=$is_woe32
@@ -19928,7 +19934,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
@@ -25713,7 +25719,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
@@ -27886,7 +27892,7 @@
case "$host_os" in
mingw*) REPLACE_SETLOCALE=1 ;;
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
1.5.*) REPLACE_SETLOCALE=1 ;;
esac
@@ -30180,7 +30186,7 @@
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/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/localename.c gettext-0.18.3.1/gettext-runtime/gnulib-lib/localename.c
--- gettext-0.18.3.1-orig/gettext-runtime/gnulib-lib/localename.c 2013-08-15 20:24:00.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/gnulib-lib/localename.c 2013-09-03 07:33:18.857421900 +0400
@@ -57,7 +57,7 @@
# define WINDOWS_NATIVE
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
/* List of language codes, sorted by value:
@@ -1405,7 +1405,7 @@
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
/* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer.
@@ -2670,7 +2670,7 @@
However it does not specify the exact format. Neither do SUSV2 and
ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined __CYGWIN__
# define HAVE_LOCALE_NULL
#endif
@@ -2725,11 +2725,6 @@
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
-#if defined __CYGWIN__
- /* Cygwin.
- Ignore dummy LANG value set by ~/.profile. */
- if (strcmp (retval, "C.UTF-8") != 0)
-#endif
return retval;
}
@@ -2822,7 +2817,7 @@
# endif
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WINDOWS_NATIVE /* Native Windows */
{
LCID lcid;
@@ -2832,6 +2827,23 @@
return gl_locale_name_from_win32_LCID (lcid);
}
# endif
+# if defined __CYGWIN__
+ {
+ /* Rarely arrive here. This function is called only when an earlier
+ * call to gl_locale_name_posix() or gl_locale_name_environ()
+ * returned NULL. That first function now simply delegates to
+ * setlocale (LC_*, NULL), which never fails on cygwin. But...for
+ * completeness, or when called after gl_locale_name_environ() and
+ * none are set, go ahead and specify the cygwin default. Cheat a bit
+ * to distinguish old cygwin (1.5 and below) from new cygwin (1.7+).
+ */
+# if PATH_MAX < 261 /* cygwin 1.5 or below */
+ return "C";
+# else /* PATH_MAX = 4096, cygwin 1.7 or above */
+ return "C.UTF-8";
+# endif
+ }
+# endif
#endif
}
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-lib/Makefile.in gettext-0.18.3.1/gettext-runtime/gnulib-lib/Makefile.in
--- gettext-0.18.3.1-orig/gettext-runtime/gnulib-lib/Makefile.in 2013-08-15 20:26:40.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/gnulib-lib/Makefile.in 2013-09-03 07:33:18.857421900 +0400
@@ -1877,7 +1877,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/intl/localename.c gettext-0.18.3.1/gettext-runtime/intl/localename.c
--- gettext-0.18.3.1-orig/gettext-runtime/intl/localename.c 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/intl/localename.c 2013-09-03 07:33:18.857421900 +0400
@@ -57,7 +57,7 @@
# define WINDOWS_NATIVE
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
/* List of language codes, sorted by value:
@@ -1405,7 +1405,7 @@
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
/* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer.
@@ -2670,7 +2670,7 @@
However it does not specify the exact format. Neither do SUSV2 and
ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined __CYGWIN__
# define HAVE_LOCALE_NULL
#endif
@@ -2725,11 +2725,6 @@
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
-#if defined __CYGWIN__
- /* Cygwin.
- Ignore dummy LANG value set by ~/.profile. */
- if (strcmp (retval, "C.UTF-8") != 0)
-#endif
return retval;
}
@@ -2822,7 +2817,7 @@
# endif
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WINDOWS_NATIVE /* Native Windows */
{
LCID lcid;
@@ -2832,6 +2827,23 @@
return gl_locale_name_from_win32_LCID (lcid);
}
# endif
+# if defined __CYGWIN__
+ {
+ /* Rarely arrive here. This function is called only when an earlier
+ * call to gl_locale_name_posix() or gl_locale_name_environ()
+ * returned NULL. That first function now simply delegates to
+ * setlocale (LC_*, NULL), which never fails on cygwin. But...for
+ * completeness, or when called after gl_locale_name_environ() and
+ * none are set, go ahead and specify the cygwin default. Cheat a bit
+ * to distinguish old cygwin (1.5 and below) from new cygwin (1.7+).
+ */
+# if PATH_MAX < 261 /* cygwin 1.5 or below */
+ return "C";
+# else /* PATH_MAX = 4096, cygwin 1.7 or above */
+ return "C.UTF-8";
+# endif
+ }
+# endif
#endif
}
diff -Naur gettext-0.18.3.1-orig/gettext-runtime/intl/Makefile.in gettext-0.18.3.1/gettext-runtime/intl/Makefile.in
--- gettext-0.18.3.1-orig/gettext-runtime/intl/Makefile.in 2013-07-29 15:35:59.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/intl/Makefile.in 2013-09-03 07:33:18.873046900 +0400
@@ -418,7 +418,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 ;; \
@@ -504,7 +504,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/libasprintf/configure gettext-0.18.3.1/gettext-runtime/libasprintf/configure
--- gettext-0.18.3.1-orig/gettext-runtime/libasprintf/configure 2013-08-15 20:26:28.000000000 +0400
+++ gettext-0.18.3.1/gettext-runtime/libasprintf/configure 2013-09-03 07:33:18.873046900 +0400
@@ -5183,7 +5183,7 @@
case "$host_os" in
- mingw* | cygwin*)
+ mingw*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
$as_echo_n "checking for auto-import of symbols... " >&6; }
if ${gl_cv_ld_autoimport+:} false; then :
@@ -5836,7 +5836,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -6025,7 +6025,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -6033,12 +6033,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -6104,7 +6104,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
if test "$GCC" != yes; then
reload_cmds=false
fi
@@ -6259,7 +6259,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -6577,7 +6577,7 @@
lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh
# decide which to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -7069,7 +7069,7 @@
aix*)
symcode='[BCDT]'
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -8471,7 +8471,7 @@
enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -9330,7 +9330,7 @@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -9414,7 +9414,7 @@
fi
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -9905,7 +9905,7 @@
extract_expsyms_cmds=
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++.
@@ -10020,7 +10020,7 @@
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -10477,7 +10477,7 @@
export_dynamic_flag_spec=-rdynamic
;;
- 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
@@ -11430,7 +11430,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
@@ -11462,6 +11462,12 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -11496,7 +11502,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -12157,7 +12163,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen_libs=
;;
@@ -13406,7 +13412,7 @@
esac
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl*)
# Native MSVC
@@ -14439,7 +14445,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -14509,7 +14515,7 @@
;;
esac
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
@@ -14994,7 +15000,7 @@
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
case $cc_basename in
cl*)
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -15263,7 +15269,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
@@ -15294,6 +15300,11 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -15328,7 +15339,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -15960,7 +15971,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
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 gettext-0.18.3.1/gettext-tools/configure
--- gettext-0.18.3.1-orig/gettext-tools/configure 2013-08-15 20:31:08.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/configure 2013-09-03 07:33:18.919921900 +0400
@@ -7117,7 +7117,7 @@
&& clix $srcdir/m4/csharpexec-test.exe >/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*)
@@ -8449,7 +8449,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 ;;
@@ -9097,7 +9097,7 @@
case "$host_os" in
- mingw* | cygwin*)
+ mingw*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
$as_echo_n "checking for auto-import of symbols... " >&6; }
if ${gl_cv_ld_autoimport+:} false; then :
@@ -9751,7 +9751,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -9940,7 +9940,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -9948,12 +9948,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
@@ -10019,7 +10019,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
if test "$GCC" != yes; then
reload_cmds=false
fi
@@ -10174,7 +10174,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -10492,7 +10492,7 @@
lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh
# decide which to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -10984,7 +10984,7 @@
aix*)
symcode='[BCDT]'
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
@@ -12246,7 +12246,7 @@
enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -13105,7 +13105,7 @@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -13189,7 +13189,7 @@
fi
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -13680,7 +13680,7 @@
extract_expsyms_cmds=
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++.
@@ -13795,7 +13795,7 @@
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -14252,7 +14252,7 @@
export_dynamic_flag_spec=-rdynamic
;;
- 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
@@ -15205,7 +15205,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
@@ -15237,6 +15237,12 @@
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -15271,7 +15277,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -15932,7 +15938,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen_libs=
;;
@@ -16724,7 +16730,7 @@
case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
+ mingw*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
if test $is_woe32 = yes; then
@@ -16737,7 +16743,7 @@
case "$host_os" in
- cygwin*) ac_cv_lib_error_at_line=no ;;
+ cygwin* | msys*) ac_cv_lib_error_at_line=no ;;
esac
@@ -20817,7 +20823,7 @@
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
@@ -20827,7 +20833,7 @@
case "$host_os" in
- mingw* | cygwin*) is_woe32=yes ;;
+ mingw* | cygwin* | msys*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
WOE32=$is_woe32
@@ -22022,7 +22028,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
@@ -27580,7 +27586,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 ;;
@@ -34295,7 +34301,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
@@ -35499,7 +35505,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
@@ -35541,7 +35547,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.
@@ -43824,7 +43830,7 @@
case "$host_os" in
mingw*) REPLACE_SETLOCALE=1 ;;
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
1.5.*) REPLACE_SETLOCALE=1 ;;
esac
@@ -54151,13 +54157,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
@@ -62711,7 +62717,7 @@
if test "$enable_shared" = yes; then
case "$host_os" in
- mingw* | cygwin*) is_woe32dll=yes ;;
+ mingw*) is_woe32dll=yes ;;
*) is_woe32dll=no ;;
esac
else
@@ -65717,7 +65723,7 @@
esac
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl*)
# Native MSVC
@@ -66750,7 +66756,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -66820,7 +66826,7 @@
;;
esac
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
@@ -67305,7 +67311,7 @@
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
case $cc_basename in
cl*)
exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -67574,7 +67580,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
@@ -67605,6 +67611,11 @@
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -67639,7 +67650,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
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
@@ -100,7 +100,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*) is_woe32=yes ;;
*) is_woe32=no ;;
esac
AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
@@ -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.
@@ -210,7 +210,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*) is_woe32dll=yes ;;
*) is_woe32dll=no ;;
esac
else
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-lib/Makefile.in gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile.in
--- gettext-0.18.3.1-orig/gettext-tools/gnulib-lib/Makefile.in 2013-08-15 20:31:13.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/gnulib-lib/Makefile.in 2013-09-03 07:33:18.935546900 +0400
@@ -3817,7 +3817,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 ;; \
diff -Naur gettext-0.18.3.1-orig/gettext-tools/libgettextpo/Makefile.in gettext-0.18.3.1/gettext-tools/libgettextpo/Makefile.in
--- gettext-0.18.3.1-orig/gettext-tools/libgettextpo/Makefile.in 2013-08-15 20:31:14.000000000 +0400
+++ gettext-0.18.3.1/gettext-tools/libgettextpo/Makefile.in 2013-09-03 07:33:18.982421900 +0400
@@ -2652,7 +2652,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/m4/libtool.m4 gettext-0.18.3.1/m4/libtool.m4
--- gettext-0.18.3.1-orig/m4/libtool.m4 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/m4/libtool.m4 2013-09-03 07:33:18.982421900 +0400
@@ -1616,7 +1616,7 @@
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1863,7 +1863,7 @@
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen_libs=
;;
@@ -2334,7 +2334,7 @@
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
version_type=windows
shrext_cmds=".dll"
need_version=no
@@ -2366,6 +2366,12 @@
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
+ msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+ ;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -2400,7 +2406,7 @@
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -3140,7 +3146,7 @@
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
if test "$GCC" != yes; then
reload_cmds=false
fi
@@ -3196,7 +3202,7 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -3509,7 +3515,7 @@
[lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh
# decide which to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -3564,7 +3570,7 @@
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3639,7 +3645,7 @@
aix*)
symcode='[[BCDT]]'
;;
-cygwin* | mingw* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -3907,7 +3913,7 @@
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3978,7 +3984,7 @@
;;
esac
;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4225,7 +4231,7 @@
# PIC is the default for these OSes.
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4310,7 +4316,7 @@
fi
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4570,7 +4576,7 @@
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
- cygwin* | mingw* | cegcc*)
+ cygwin* | msys* | mingw* | cegcc*)
case $cc_basename in
cl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -4628,7 +4634,7 @@
extract_expsyms_cmds=
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++.
@@ -4743,7 +4749,7 @@
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -5116,7 +5122,7 @@
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
- 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
@@ -6117,7 +6123,7 @@
esac
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl*)
# Native MSVC
@@ -7933,7 +7939,7 @@
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -7941,12 +7947,12 @@
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
case $build in
*-*-mingw* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
diff -Naur gettext-0.18.3.1-orig/m4/ltoptions.m4 gettext-0.18.3.1/m4/ltoptions.m4
--- gettext-0.18.3.1-orig/m4/ltoptions.m4 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/m4/ltoptions.m4 2013-09-03 07:33:18.998046900 +0400
@@ -126,7 +126,7 @@
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff -Naur gettext-0.18.3.1-orig/m4/woe32-dll.m4 gettext-0.18.3.1/m4/woe32-dll.m4
--- gettext-0.18.3.1-orig/m4/woe32-dll.m4 2012-12-10 05:59:06.000000000 +0400
+++ gettext-0.18.3.1/m4/woe32-dll.m4 2013-09-03 07:33:18.998046900 +0400
@@ -30,7 +30,7 @@
[
AC_REQUIRE([AC_CANONICAL_HOST])
case "$host_os" in
- mingw* | cygwin*)
+ mingw*)
AC_MSG_CHECKING([for auto-import of symbols])
AC_CACHE_VAL([gl_cv_ld_autoimport], [
gl_save_LDFLAGS="$LDFLAGS"
Reference in New Issue View Git Blame Copy Permalink