1079 lines
39 KiB
Diff
1079 lines
39 KiB
Diff
From 19b2e0aff735eb0746c05560ad972d232394e90f Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Tue, 28 Dec 2021 09:29:23 +0100
|
|
Subject: [PATCH 6/6] autoreconf
|
|
|
|
---
|
|
bfd/configure | 36 ++++++++++++++++----------
|
|
configure | 22 ++++++++--------
|
|
gdb/configure | 50 ++++++++++++++++++-------------------
|
|
gnulib/configure | 8 +++---
|
|
intl/configure | 2 ++
|
|
libctf/configure | 32 ++++++++++++++++--------
|
|
libdecnumber/configure | 3 ++-
|
|
libiberty/configure | 4 ++-
|
|
opcodes/configure | 34 ++++++++++++++++---------
|
|
readline/readline/configure | 2 +-
|
|
sim/configure | 28 +++++++++++++--------
|
|
zlib/configure | 28 +++++++++++++--------
|
|
12 files changed, 148 insertions(+), 101 deletions(-)
|
|
|
|
diff --git a/bfd/configure b/bfd/configure
|
|
index 31dfac508a2..d3875b668a3 100755
|
|
--- a/bfd/configure
|
|
+++ b/bfd/configure
|
|
@@ -5654,7 +5654,7 @@ else
|
|
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,
|
|
@@ -5996,7 +5996,7 @@ bsdi[45]*)
|
|
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'
|
|
@@ -6607,7 +6607,7 @@ case $host_os in
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8191,7 +8191,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
# 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
|
|
@@ -8273,7 +8273,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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'
|
|
@@ -8735,7 +8735,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
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++.
|
|
@@ -8850,7 +8850,7 @@ _LT_EOF
|
|
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'
|
|
@@ -9281,7 +9281,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
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
|
|
@@ -10182,14 +10182,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -10211,6 +10211,12 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
+ 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*)
|
|
@@ -10839,7 +10845,7 @@ else
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -13021,7 +13027,7 @@ _ACEOF
|
|
|
|
|
|
case "${host}" in
|
|
-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
|
|
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-msys* | *-*-windows*)
|
|
|
|
$as_echo "#define USE_BINARY_FOPEN 1" >>confdefs.h
|
|
;;
|
|
@@ -13341,7 +13347,7 @@ $as_echo "$bfd_cv_ld_as_needed" >&6; }
|
|
|
|
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*)
|
|
@@ -13495,6 +13501,10 @@ if test "$enable_shared" = "yes"; then
|
|
SHARED_LDFLAGS="-no-undefined"
|
|
SHARED_LIBADD="-L`pwd`/../libiberty -liberty $SHARED_LIBADD -lcygwin -lkernel32"
|
|
;;
|
|
+ *-*-msys*)
|
|
+ SHARED_LDFLAGS="-no-undefined"
|
|
+ SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lmsys-2.0 -lkernel32"
|
|
+ ;;
|
|
esac
|
|
|
|
if test -n "$SHARED_LIBADD"; then
|
|
diff --git a/configure b/configure
|
|
index 80b2b02fe7e..12dc72d614d 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3171,7 +3171,7 @@ fi
|
|
# Configure extra directories which are host specific
|
|
|
|
case "${host}" in
|
|
- *-cygwin*)
|
|
+ *-cygwin* | *-msys*)
|
|
configdirs="$configdirs libtermcap" ;;
|
|
esac
|
|
|
|
@@ -3645,7 +3645,7 @@ esac
|
|
# Disable the go frontend on systems where it is known to not work. Please keep
|
|
# this in sync with contrib/config-list.mk.
|
|
case "${target}" in
|
|
-*-*-darwin* | *-*-cygwin* | *-*-mingw* | bpf-* )
|
|
+*-*-darwin* | *-*-cygwin* | *-*-msys* | *-*-mingw* | bpf-* )
|
|
unsupported_languages="$unsupported_languages go"
|
|
;;
|
|
esac
|
|
@@ -3677,7 +3677,7 @@ if test x$enable_libgo = x; then
|
|
# PR 46986
|
|
noconfigdirs="$noconfigdirs target-libgo"
|
|
;;
|
|
- *-*-cygwin* | *-*-mingw*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw*)
|
|
noconfigdirs="$noconfigdirs target-libgo"
|
|
;;
|
|
bpf-*-*)
|
|
@@ -3963,7 +3963,7 @@ case "${target}" in
|
|
i[3456789]86-*-mingw*)
|
|
target_configdirs="$target_configdirs target-winsup"
|
|
;;
|
|
- *-*-cygwin*)
|
|
+ *-*-cygwin* | *-*-msys*)
|
|
target_configdirs="$target_configdirs target-libtermcap target-winsup"
|
|
noconfigdirs="$noconfigdirs target-libgloss"
|
|
# always build newlib if winsup directory is present.
|
|
@@ -4116,7 +4116,7 @@ case "${host}" in
|
|
i[3456789]86-*-msdosdjgpp*)
|
|
host_makefile_frag="config/mh-djgpp"
|
|
;;
|
|
- *-cygwin*)
|
|
+ *-cygwin* | *-msys*)
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5
|
|
$as_echo_n "checking to see if cat works as expected... " >&6; }
|
|
@@ -8648,7 +8648,7 @@ fi
|
|
|
|
target_elf=no
|
|
case $target in
|
|
- *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
|
|
+ *-darwin* | *-aix* | *-cygwin* |*-msys* | *-mingw* | *-aout* | *-*coff* | \
|
|
*-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \
|
|
alpha*-dec-osf* | *-interix* | hppa[12]*-*-hpux* | \
|
|
nvptx-*-none)
|
|
@@ -8666,7 +8666,7 @@ if test $target_elf = yes; then :
|
|
else
|
|
if test x"$default_enable_lto" = x"yes" ; then
|
|
case $target in
|
|
- *-apple-darwin[912]* | *-cygwin* | *-mingw* | *djgpp*) ;;
|
|
+ *-apple-darwin[912]* | *-cygwin* | *-msys* | *-mingw* | *djgpp*) ;;
|
|
# On other non-ELF platforms, LTO has yet to be validated.
|
|
*) enable_lto=no ;;
|
|
esac
|
|
@@ -8677,7 +8677,7 @@ else
|
|
# warn during gcc/ subconfigure; unless you're bootstrapping with
|
|
# -flto it won't be needed until after installation anyway.
|
|
case $target in
|
|
- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
|
|
+ *-cygwin* | *-msys* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
|
|
*) if test x"$enable_lto" = x"yes"; then
|
|
as_fn_error $? "LTO support is not enabled for this target." "$LINENO" 5
|
|
fi
|
|
@@ -8687,7 +8687,7 @@ else
|
|
# Among non-ELF, only Windows platforms support the lto-plugin so far.
|
|
# Build it unless LTO was explicitly disabled.
|
|
case $target in
|
|
- *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;;
|
|
+ *-cygwin* | *-msys* | *-mingw*) build_lto_plugin=$enable_lto ;;
|
|
*) ;;
|
|
esac
|
|
|
|
@@ -9701,7 +9701,7 @@ rm -f conftest*
|
|
case "${host}" in
|
|
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
|
|
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
|
|
- *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
|
|
+ *-*-mingw* | *-*-cygwin | *-*-msys ) RPATH_ENVVAR=PATH ;;
|
|
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
|
|
esac
|
|
|
|
@@ -10251,7 +10251,7 @@ case " $target_configdirs " in
|
|
case " $target_configargs " in
|
|
*" --with-newlib "*)
|
|
case "$target" in
|
|
- *-cygwin*)
|
|
+ *-cygwin* | *-msys*)
|
|
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'
|
|
;;
|
|
esac
|
|
diff --git a/gdb/configure b/gdb/configure
|
|
index bdc84be9c01..9cfc41e95e3 100755
|
|
--- a/gdb/configure
|
|
+++ b/gdb/configure
|
|
@@ -5926,7 +5926,7 @@ else
|
|
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,
|
|
@@ -6268,7 +6268,7 @@ bsdi[45]*)
|
|
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'
|
|
@@ -6921,7 +6921,7 @@ case $host_os in
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8537,7 +8537,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
# 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
|
|
@@ -8619,7 +8619,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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'
|
|
@@ -9081,7 +9081,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
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++.
|
|
@@ -9196,7 +9196,7 @@ _LT_EOF
|
|
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'
|
|
@@ -9627,7 +9627,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
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
|
|
@@ -10528,14 +10528,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -10553,9 +10553,9 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
shlibpath_overrides_runpath=yes
|
|
|
|
case $host_os in
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+ 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"
|
|
;;
|
|
@@ -11185,7 +11185,7 @@ else
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -12407,7 +12407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
|
|
# as there is no search path for DLLs.
|
|
hardcode_libdir_flag_spec_CXX='-L$libdir'
|
|
@@ -13376,7 +13376,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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
|
|
@@ -13916,7 +13916,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
pw32*)
|
|
export_symbols_cmds_CXX="$ltdll_cmds"
|
|
;;
|
|
- cygwin* | mingw* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | cegcc*)
|
|
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
;;
|
|
*)
|
|
@@ -14180,14 +14180,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -14205,9 +14205,9 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
shlibpath_overrides_runpath=yes
|
|
|
|
case $host_os in
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
|
|
|
|
;;
|
|
mingw* | cegcc*)
|
|
@@ -20502,7 +20502,7 @@ fi
|
|
# have a separate termcap library, or no curses library at all.
|
|
|
|
case $host_os in
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
if test -d "$srcdir/libtermcap"; then
|
|
LIBS="../libtermcap/libtermcap.a $LIBS"
|
|
ac_cv_search_tgetent="../libtermcap/libtermcap.a"
|
|
@@ -28542,7 +28542,7 @@ WIN32LIBS=
|
|
if test x"$gdb_cv_os_cygwin" = xyes; then
|
|
WIN32LIBS="-luser32"
|
|
case "${target}" in
|
|
- *cygwin*) WIN32LIBS="$WIN32LIBS -limagehlp"
|
|
+ *cygwin* | *msys*) WIN32LIBS="$WIN32LIBS -limagehlp"
|
|
;;
|
|
esac
|
|
fi
|
|
@@ -29238,7 +29238,7 @@ WIN32LDAPP=
|
|
|
|
|
|
case "${host}" in
|
|
-*-*-cygwin* | *-*-mingw* )
|
|
+*-*-cygwin* | *-*-msys* | *-*-mingw* )
|
|
configdir="win"
|
|
;;
|
|
*)
|
|
@@ -29281,7 +29281,7 @@ else
|
|
|
|
# First check to see if --with-tcl was specified.
|
|
case "${host}" in
|
|
- *-*-cygwin*) platDir="win" ;;
|
|
+ *-*-cygwin* | *-*-msys*) platDir="win" ;;
|
|
*) platDir="unix" ;;
|
|
esac
|
|
if test x"${with_tclconfig}" != x ; then
|
|
@@ -29410,7 +29410,7 @@ else
|
|
|
|
# then check for a private Tk library
|
|
case "${host}" in
|
|
- *-*-cygwin*) platDir="win" ;;
|
|
+ *-*-cygwin* | *-*-msys*) platDir="win" ;;
|
|
*) platDir="unix" ;;
|
|
esac
|
|
if test x"${ac_cv_c_tkconfig}" = x ; then
|
|
diff --git a/gnulib/configure b/gnulib/configure
|
|
index cc7e8287d5a..808ce376a1c 100644
|
|
--- a/gnulib/configure
|
|
+++ b/gnulib/configure
|
|
@@ -9124,7 +9124,7 @@ else
|
|
# 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
|
|
@@ -23563,7 +23563,7 @@ else
|
|
# 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
|
|
@@ -23711,7 +23711,7 @@ else
|
|
case "$host_os" in
|
|
mingw*) # on this platform, dup2 always returns 0 for success
|
|
gl_cv_func_dup2_works="guessing no" ;;
|
|
- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
|
|
+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
|
|
gl_cv_func_dup2_works="guessing no" ;;
|
|
aix* | freebsd*)
|
|
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
|
|
@@ -24112,7 +24112,7 @@ if ${gl_cv_func_fcntl_f_dupfd_works+:} false; then :
|
|
else
|
|
if test "$cross_compiling" = yes; then :
|
|
case $host_os in
|
|
- aix* | cygwin* | haiku*)
|
|
+ aix* | cygwin* | msys* | haiku*)
|
|
gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
|
|
*) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
|
|
esac
|
|
diff --git a/intl/configure b/intl/configure
|
|
index e75f072f8fa..aa72efc5039 100755
|
|
--- a/intl/configure
|
|
+++ b/intl/configure
|
|
@@ -6838,6 +6838,8 @@ case "${host}" in
|
|
;;
|
|
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
|
|
;;
|
|
+ i[34567]86-*-msys* | x86_64-*-msys*)
|
|
+ ;;
|
|
i[34567]86-*-mingw* | x86_64-*-mingw*)
|
|
;;
|
|
i[34567]86-*-interix[3-9]*)
|
|
diff --git a/libctf/configure b/libctf/configure
|
|
index 17463a74cca..ad4035b5345 100755
|
|
--- a/libctf/configure
|
|
+++ b/libctf/configure
|
|
@@ -6179,7 +6179,7 @@ else
|
|
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,
|
|
@@ -6521,7 +6521,7 @@ bsdi[45]*)
|
|
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'
|
|
@@ -7132,7 +7132,7 @@ case $host_os in
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8717,7 +8717,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
# 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
|
|
@@ -8799,7 +8799,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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'
|
|
@@ -9261,7 +9261,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
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++.
|
|
@@ -9376,7 +9376,7 @@ _LT_EOF
|
|
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'
|
|
@@ -9807,7 +9807,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
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
|
|
@@ -10708,14 +10708,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -10737,6 +10737,12 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
+ 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*)
|
|
@@ -11365,7 +11371,7 @@ else
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -14917,6 +14923,10 @@ if test "$enable_shared" = "yes"; then
|
|
SHARED_LDFLAGS="-no-undefined"
|
|
CTF_LIBADD="$CTF_LIBADD -lcygwin"
|
|
;;
|
|
+ *-*-msys*)
|
|
+ SHARED_LDFLAGS="-no-undefined"
|
|
+ CTF_LIBADD="$CTF_LIBADD -lmsys-2.0"
|
|
+ ;;
|
|
esac
|
|
fi
|
|
|
|
diff --git a/libdecnumber/configure b/libdecnumber/configure
|
|
index 87f3bd5e457..d15b56ed3ce 100755
|
|
--- a/libdecnumber/configure
|
|
+++ b/libdecnumber/configure
|
|
@@ -4765,7 +4765,8 @@ else
|
|
powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
|
|
i?86*-*-elfiamcu | i?86*-*-gnu* | x86_64*-*-gnu* | \
|
|
i?86*-*-mingw* | x86_64*-*-mingw* | \
|
|
- i?86*-*-cygwin* | x86_64*-*-cygwin*)
|
|
+ i?86*-*-cygwin* | x86_64*-*-cygwin* | \
|
|
+ i?86*-*-msys* | x86_64*-*-msys*)
|
|
enable_decimal_float=yes
|
|
;;
|
|
*)
|
|
diff --git a/libiberty/configure b/libiberty/configure
|
|
index 451af4978e7..2a3d52c3d09 100755
|
|
--- a/libiberty/configure
|
|
+++ b/libiberty/configure
|
|
@@ -5330,6 +5330,8 @@ case "${host}" in
|
|
;;
|
|
i[34567]86-*-cygwin* | x86_64-*-cygwin*)
|
|
;;
|
|
+ i[34567]86-*-msys* | x86_64-*-msys*)
|
|
+ ;;
|
|
i[34567]86-*-mingw* | x86_64-*-mingw*)
|
|
;;
|
|
i[34567]86-*-interix[3-9]*)
|
|
@@ -6626,7 +6628,7 @@ fi
|
|
|
|
|
|
case "${host}" in
|
|
- *-*-cygwin* | *-*-mingw*)
|
|
+ *-*-cygwin* | *-*-msys* | *-*-mingw*)
|
|
$as_echo "#define HAVE_SYS_ERRLIST 1" >>confdefs.h
|
|
|
|
$as_echo "#define HAVE_SYS_NERR 1" >>confdefs.h
|
|
diff --git a/opcodes/configure b/opcodes/configure
|
|
index 9dc87d6c19c..41b255366e2 100755
|
|
--- a/opcodes/configure
|
|
+++ b/opcodes/configure
|
|
@@ -5588,7 +5588,7 @@ else
|
|
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,
|
|
@@ -5930,7 +5930,7 @@ bsdi[45]*)
|
|
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'
|
|
@@ -6541,7 +6541,7 @@ case $host_os in
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -8126,7 +8126,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
# 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
|
|
@@ -8208,7 +8208,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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'
|
|
@@ -8670,7 +8670,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
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++.
|
|
@@ -8785,7 +8785,7 @@ _LT_EOF
|
|
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'
|
|
@@ -9216,7 +9216,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
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
|
|
@@ -10117,14 +10117,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -10146,6 +10146,12 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
+ 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*)
|
|
@@ -10774,7 +10780,7 @@ else
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
@@ -12271,7 +12277,7 @@ $as_echo "$bfd_cv_ld_as_needed" >&6; }
|
|
|
|
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*)
|
|
@@ -12447,6 +12453,10 @@ if test "$enable_shared" = "yes"; then
|
|
SHARED_LDFLAGS="-no-undefined"
|
|
SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty $SHARED_LIBADD"
|
|
;;
|
|
+ *-*-msys*)
|
|
+ SHARED_LDFLAGS="-no-undefined"
|
|
+ SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lmsys-2.0"
|
|
+ ;;
|
|
*)
|
|
SHARED_LIBADD="../bfd/libbfd.la ${SHARED_LIBADD}"
|
|
SHARED_DEPENDENCIES="../bfd/libbfd.la"
|
|
diff --git a/readline/readline/configure b/readline/readline/configure
|
|
index 6ea4545e26f..2aec06a0d99 100755
|
|
--- a/readline/readline/configure
|
|
+++ b/readline/readline/configure
|
|
@@ -2615,7 +2615,7 @@ fi
|
|
CROSS_COMPILE=
|
|
if test "x$cross_compiling" = "xyes"; then
|
|
case "${host}" in
|
|
- *-cygwin*)
|
|
+ *-cygwin* | *-msys*)
|
|
cross_cache=${srcdir}/cross-build/cygwin.cache
|
|
;;
|
|
*-mingw*)
|
|
diff --git a/sim/configure b/sim/configure
|
|
index 57c4fcf6972..03a54666211 100755
|
|
--- a/sim/configure
|
|
+++ b/sim/configure
|
|
@@ -6234,7 +6234,7 @@ else
|
|
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,
|
|
@@ -6576,7 +6576,7 @@ bsdi[45]*)
|
|
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'
|
|
@@ -7229,7 +7229,7 @@ case $host_os in
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -9516,7 +9516,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
# 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
|
|
@@ -9598,7 +9598,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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'
|
|
@@ -10060,7 +10060,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
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++.
|
|
@@ -10175,7 +10175,7 @@ _LT_EOF
|
|
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'
|
|
@@ -10606,7 +10606,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
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
|
|
@@ -11507,14 +11507,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -11536,6 +11536,12 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
+ 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*)
|
|
@@ -12164,7 +12170,7 @@ else
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
diff --git a/zlib/configure b/zlib/configure
|
|
index e65ade3badd..0f9d3cff7a1 100755
|
|
--- a/zlib/configure
|
|
+++ b/zlib/configure
|
|
@@ -4927,7 +4927,7 @@ else
|
|
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,
|
|
@@ -5269,7 +5269,7 @@ bsdi[45]*)
|
|
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'
|
|
@@ -5880,7 +5880,7 @@ case $host_os in
|
|
aix*)
|
|
symcode='[BCDT]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[ABCDGISTW]'
|
|
;;
|
|
hpux*)
|
|
@@ -7769,7 +7769,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
# 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
|
|
@@ -7851,7 +7851,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
|
|
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'
|
|
@@ -8313,7 +8313,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
|
|
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++.
|
|
@@ -8428,7 +8428,7 @@ _LT_EOF
|
|
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'
|
|
@@ -8865,7 +8865,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
|
|
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
|
|
@@ -9769,14 +9769,14 @@ bsdi[45]*)
|
|
# 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
|
|
need_lib_prefix=no
|
|
|
|
case $GCC,$host_os in
|
|
- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
+ yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
|
|
library_names_spec='$libname.dll.a'
|
|
# DLL is installed to $(libdir)/../bin by postinstall_cmds
|
|
postinstall_cmds='base_file=`basename \${file}`~
|
|
@@ -9798,6 +9798,12 @@ cygwin* | mingw* | pw32* | cegcc*)
|
|
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
|
|
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
|
|
|
|
+ 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*)
|
|
@@ -10429,7 +10435,7 @@ else
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
lt_cv_dlopen="dlopen"
|
|
lt_cv_dlopen_libs=
|
|
;;
|
|
--
|
|
2.40.0.windows.1
|
|
|