297 lines
9.8 KiB
Diff
297 lines
9.8 KiB
Diff
diff -Naur flex-2.5.38/compile flex-2.5.38-msys2/compile
|
|
--- flex-2.5.38/compile 2013-11-01 17:28:50.000000000 +0400
|
|
+++ flex-2.5.38-msys2/compile 2014-02-16 11:03:46.600200000 +0400
|
|
@@ -54,7 +54,7 @@
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
- CYGWIN*)
|
|
+ CYGWIN*|MSYS*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
@@ -68,7 +68,7 @@
|
|
mingw/*)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
- cygwin/*)
|
|
+ cygwin/*|msys/*)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine/*)
|
|
diff -Naur flex-2.5.38/config.guess flex-2.5.38-msys2/config.guess
|
|
--- flex-2.5.38/config.guess 2013-11-01 17:28:50.000000000 +0400
|
|
+++ flex-2.5.38-msys2/config.guess 2014-02-16 11:04:45.474600000 +0400
|
|
@@ -844,6 +844,9 @@
|
|
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
|
echo x86_64-unknown-cygwin
|
|
exit ;;
|
|
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
|
+ echo x86_64-unknown-msys
|
|
+ exit ;;
|
|
p*:CYGWIN*:*)
|
|
echo powerpcle-unknown-cygwin
|
|
exit ;;
|
|
diff -Naur flex-2.5.38/config.rpath flex-2.5.38-msys2/config.rpath
|
|
--- flex-2.5.38/config.rpath 2012-08-26 18:07:14.000000000 +0400
|
|
+++ flex-2.5.38-msys2/config.rpath 2014-02-16 11:05:49.341000000 +0400
|
|
@@ -64,7 +64,7 @@
|
|
;;
|
|
esac
|
|
;;
|
|
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
|
;;
|
|
hpux9* | hpux10* | hpux11*)
|
|
wl='-Wl,'
|
|
@@ -138,7 +138,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++.
|
|
@@ -188,7 +188,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'
|
|
@@ -332,7 +332,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
|
|
@@ -523,7 +523,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 flex-2.5.38/m4/libtool.m4 flex-2.5.38-msys2/m4/libtool.m4
|
|
--- flex-2.5.38/m4/libtool.m4 2013-11-01 17:28:43.000000000 +0400
|
|
+++ flex-2.5.38-msys2/m4/libtool.m4 2014-02-16 11:13:55.691200000 +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...
|
|
@@ -3152,7 +3158,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
|
|
@@ -3208,7 +3214,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'
|
|
@@ -3518,7 +3524,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
|
|
@@ -3573,7 +3579,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*)
|
|
@@ -3648,7 +3654,7 @@
|
|
aix*)
|
|
symcode='[[BCDT]]'
|
|
;;
|
|
-cygwin* | mingw* | pw32* | cegcc*)
|
|
+cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
symcode='[[ABCDGISTW]]'
|
|
;;
|
|
hpux*)
|
|
@@ -3916,7 +3922,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
|
|
@@ -3987,7 +3993,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], [],
|
|
@@ -4234,7 +4240,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
|
|
@@ -4319,7 +4325,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], [],
|
|
@@ -4579,7 +4585,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_.*'
|
|
@@ -4640,7 +4646,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++.
|
|
@@ -4758,7 +4764,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'
|
|
@@ -5132,7 +5138,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
|
|
@@ -6133,7 +6139,7 @@
|
|
esac
|
|
;;
|
|
|
|
- cygwin* | mingw* | pw32* | cegcc*)
|
|
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
|
case $GXX,$cc_basename in
|
|
,cl* | no,cl*)
|
|
# Native MSVC
|
|
@@ -7949,7 +7955,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
|
|
@@ -7957,12 +7963,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 flex-2.5.38/m4/ltoptions.m4 flex-2.5.38-msys2/m4/ltoptions.m4
|
|
--- flex-2.5.38/m4/ltoptions.m4 2013-11-01 17:28:43.000000000 +0400
|
|
+++ flex-2.5.38-msys2/m4/ltoptions.m4 2014-02-16 11:14:36.656800000 +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)
|