Files
MSYS2-packages/bison/bison-3.0.2-msys2.patch
2014-11-05 18:59:43 +03:00

209 lines
9.1 KiB
Diff

diff -Naur bison-3.0.2-orig/build-aux/compile bison-3.0.2/build-aux/compile
--- bison-3.0.2-orig/build-aux/compile 2013-12-05 17:41:24.000000000 +0400
+++ bison-3.0.2/build-aux/compile 2013-12-11 09:19:01.937200000 +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 bison-3.0.2-orig/build-aux/config.guess bison-3.0.2/build-aux/config.guess
--- bison-3.0.2-orig/build-aux/config.guess 2013-12-05 17:36:21.000000000 +0400
+++ bison-3.0.2/build-aux/config.guess 2013-12-11 09:19:01.952800000 +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 bison-3.0.2-orig/build-aux/config.rpath bison-3.0.2/build-aux/config.rpath
--- bison-3.0.2-orig/build-aux/config.rpath 2013-08-02 19:03:12.000000000 +0400
+++ bison-3.0.2/build-aux/config.rpath 2013-12-11 09:19:01.952800000 +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 bison-3.0.2-orig/lib/gnulib.mk bison-3.0.2/lib/gnulib.mk
--- bison-3.0.2-orig/lib/gnulib.mk 2013-12-05 17:41:06.000000000 +0400
+++ bison-3.0.2/lib/gnulib.mk 2013-12-11 09:19:01.999600000 +0400
@@ -747,7 +747,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 bison-3.0.2-orig/m4/double-slash-root.m4 bison-3.0.2/m4/double-slash-root.m4
--- bison-3.0.2-orig/m4/double-slash-root.m4 2013-08-02 19:03:13.000000000 +0400
+++ bison-3.0.2/m4/double-slash-root.m4 2013-12-11 09:19:01.999600000 +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 bison-3.0.2-orig/m4/dup2.m4 bison-3.0.2/m4/dup2.m4
--- bison-3.0.2-orig/m4/dup2.m4 2013-10-23 12:25:42.000000000 +0400
+++ bison-3.0.2/m4/dup2.m4 2013-12-11 09:19:02.015200000 +0400
@@ -51,7 +51,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 bison-3.0.2-orig/m4/getdtablesize.m4 bison-3.0.2/m4/getdtablesize.m4
--- bison-3.0.2-orig/m4/getdtablesize.m4 2013-10-23 12:25:42.000000000 +0400
+++ bison-3.0.2/m4/getdtablesize.m4 2013-12-11 09:21:30.135000000 +0400
@@ -26,7 +26,7 @@
[gl_cv_func_getdtablesize_works=yes],
[gl_cv_func_getdtablesize_works=no],
[case "$host_os" in
- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows
gl_cv_func_getdtablesize_works="guessing no" ;;
*) gl_cv_func_getdtablesize_works="guessing yes" ;;
esac])
diff -Naur bison-3.0.2-orig/m4/malloc.m4 bison-3.0.2/m4/malloc.m4
--- bison-3.0.2-orig/m4/malloc.m4 2013-08-02 19:03:13.000000000 +0400
+++ bison-3.0.2/m4/malloc.m4 2013-12-11 09:19:02.015200000 +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 bison-3.0.2-orig/m4/printf.m4 bison-3.0.2/m4/printf.m4
--- bison-3.0.2-orig/m4/printf.m4 2013-08-02 19:03:13.000000000 +0400
+++ bison-3.0.2/m4/printf.m4 2013-12-11 09:19:02.030800000 +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 bison-3.0.2-orig/m4/realloc.m4 bison-3.0.2/m4/realloc.m4
--- bison-3.0.2-orig/m4/realloc.m4 2013-08-02 19:03:13.000000000 +0400
+++ bison-3.0.2/m4/realloc.m4 2013-12-11 09:19:02.218000000 +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 bison-3.0.2-orig/m4/threadlib.m4 bison-3.0.2/m4/threadlib.m4
--- bison-3.0.2-orig/m4/threadlib.m4 2013-08-02 19:03:13.000000000 +0400
+++ bison-3.0.2/m4/threadlib.m4 2013-12-11 09:19:02.233600000 +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 bison-3.0.2-orig/Makefile.in bison-3.0.2/Makefile.in
--- bison-3.0.2-orig/Makefile.in 2013-12-05 17:58:54.000000000 +0400
+++ bison-3.0.2/Makefile.in 2013-12-11 09:19:02.233600000 +0400
@@ -5397,7 +5397,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 ;; \