Skip to content

Commit

Permalink
msys2-runtime: Update to Cygwin's 2.6.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexpux committed Sep 7, 2016
1 parent 98c9a0f commit 79eddc9
Show file tree
Hide file tree
Showing 25 changed files with 217 additions and 252 deletions.
58 changes: 29 additions & 29 deletions msys2-runtime/0001-Add-MSYS-triplets.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 64baebaee865053b19778814e08cf4f8772eda78 Mon Sep 17 00:00:00 2001
From 5da91476b2ff8430b1b99fef96339dfc0007e139 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Tue, 1 Mar 2016 08:51:16 +0300
Subject: [PATCH 01/23] Add MSYS triplets.
Expand Down Expand Up @@ -66,10 +66,10 @@ index a85b723..a4ecdb2 100755
;;
wine/*)
diff --git a/config.guess b/config.guess
index dcd5149..61f2922 100755
index 0967f2a..a9bf777 100755
--- a/config.guess
+++ b/config.guess
@@ -884,6 +884,9 @@ EOF
@@ -888,6 +888,9 @@ EOF
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
Expand Down Expand Up @@ -134,7 +134,7 @@ index 5b29089..b03bcf0 100644
;;
*)
diff --git a/config/elf.m4 b/config/elf.m4
index 1772a44..2908ffa 100644
index 5f5cd88..b8491de 100644
--- a/config/elf.m4
+++ b/config/elf.m4
@@ -15,7 +15,7 @@ AC_REQUIRE([AC_CANONICAL_TARGET])
Expand All @@ -144,7 +144,7 @@ index 1772a44..2908ffa 100644
- *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
+ *-darwin* | *-aix* | *-cygwin* | *-msys* | *-mingw* | *-aout* | *-*coff* | \
*-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \
alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux* | \
alpha*-dec-osf* | hppa[[12]]*-*-hpux* | \
nvptx-*-none)
diff --git a/config/lthostflags.m4 b/config/lthostflags.m4
index bc0f59e..ad977d4 100644
Expand Down Expand Up @@ -182,7 +182,7 @@ index fba0d9d..df2c778 100644
*)
gcc_cv_func_mmap_anon=yes;;
diff --git a/config/picflag.m4 b/config/picflag.m4
index 2f5b972..997021a 100644
index 614421d..9d507ba 100644
--- a/config/picflag.m4
+++ b/config/picflag.m4
@@ -25,6 +25,8 @@ case "${$2}" in
Expand All @@ -193,7 +193,7 @@ index 2f5b972..997021a 100644
+ ;;
i[[34567]]86-*-mingw* | x86_64-*-mingw*)
;;
i[[34567]]86-*-interix[[3-9]]*)
i[[34567]]86-*-nto-qnx*)
diff --git a/config/tcl.m4 b/config/tcl.m4
index 4542a4b..209bd8d 100644
--- a/config/tcl.m4
Expand All @@ -217,7 +217,7 @@ index 4542a4b..209bd8d 100644
esac
if test x"${ac_cv_c_tkconfig}" = x ; then
diff --git a/configure b/configure
index ea63784..7606f48 100755
index 2d0963b..3e580a5 100755
--- a/configure
+++ b/configure
@@ -3036,7 +3036,7 @@ fi
Expand All @@ -229,7 +229,7 @@ index ea63784..7606f48 100755
configdirs="$configdirs libtermcap" ;;
esac

@@ -3554,7 +3554,7 @@ esac
@@ -3557,7 +3557,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
Expand All @@ -238,7 +238,7 @@ index ea63784..7606f48 100755
unsupported_languages="$unsupported_languages go"
;;
esac
@@ -3567,7 +3567,7 @@ if test x$enable_libgo = x; then
@@ -3570,7 +3570,7 @@ if test x$enable_libgo = x; then
# PR 46986
noconfigdirs="$noconfigdirs target-libgo"
;;
Expand All @@ -247,7 +247,7 @@ index ea63784..7606f48 100755
noconfigdirs="$noconfigdirs target-libgo"
;;
*-*-aix*)
@@ -3838,7 +3838,7 @@ case "${target}" in
@@ -3842,7 +3842,7 @@ case "${target}" in
i[3456789]86-*-mingw*)
target_configdirs="$target_configdirs target-winsup"
;;
Expand All @@ -256,7 +256,7 @@ index ea63784..7606f48 100755
target_configdirs="$target_configdirs target-libtermcap target-winsup"
noconfigdirs="$noconfigdirs target-libgloss"
# always build newlib if winsup directory is present.
@@ -3982,7 +3982,7 @@ case "${host}" in
@@ -3986,7 +3986,7 @@ case "${host}" in
i[3456789]86-*-msdosdjgpp*)
host_makefile_frag="config/mh-djgpp"
;;
Expand All @@ -265,16 +265,16 @@ index ea63784..7606f48 100755

{ $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; }
@@ -6126,7 +6126,7 @@ fi
@@ -6130,7 +6130,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* | \
alpha*-dec-osf* | hppa[12]*-*-hpux* | \
nvptx-*-none)
@@ -6144,7 +6144,7 @@ if test $target_elf = yes; then :
@@ -6148,7 +6148,7 @@ if test $target_elf = yes; then :
else
if test x"$default_enable_lto" = x"yes" ; then
case $target in
Expand All @@ -283,7 +283,7 @@ index ea63784..7606f48 100755
# On other non-ELF platforms, LTO has yet to be validated.
*) enable_lto=no ;;
esac
@@ -6155,7 +6155,7 @@ else
@@ -6159,7 +6159,7 @@ else
# warn during gcc/ subconfigure; unless you're bootstrapping with
# -flto it won't be needed until after installation anyway.
case $target in
Expand All @@ -292,7 +292,7 @@ index ea63784..7606f48 100755
*) if test x"$enable_lto" = x"yes"; then
as_fn_error "LTO support is not enabled for this target." "$LINENO" 5
fi
@@ -6165,7 +6165,7 @@ else
@@ -6169,7 +6169,7 @@ else
# Among non-ELF, only Windows platforms support the lto-plugin so far.
# Build it unless LTO was explicitly disabled.
case $target in
Expand All @@ -301,7 +301,7 @@ index ea63784..7606f48 100755
*) ;;
esac

@@ -7036,7 +7036,7 @@ rm -f conftest*
@@ -7040,7 +7040,7 @@ rm -f conftest*
case "${host}" in
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
Expand All @@ -310,7 +310,7 @@ index ea63784..7606f48 100755
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
esac

@@ -7544,7 +7544,7 @@ case " $target_configdirs " in
@@ -7548,7 +7548,7 @@ case " $target_configdirs " in
case " $target_configargs " in
*" --with-newlib "*)
case "$target" in
Expand All @@ -320,7 +320,7 @@ index ea63784..7606f48 100755
;;
esac
diff --git a/configure.ac b/configure.ac
index 54558df..a67df73 100644
index 3cb95d6..27dca41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,7 @@ AC_ARG_ENABLE(compressed_debug_sections,
Expand All @@ -332,7 +332,7 @@ index 54558df..a67df73 100644
configdirs="$configdirs libtermcap" ;;
esac

@@ -890,7 +890,7 @@ esac
@@ -893,7 +893,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
Expand All @@ -341,7 +341,7 @@ index 54558df..a67df73 100644
unsupported_languages="$unsupported_languages go"
;;
esac
@@ -903,7 +903,7 @@ if test x$enable_libgo = x; then
@@ -906,7 +906,7 @@ if test x$enable_libgo = x; then
# PR 46986
noconfigdirs="$noconfigdirs target-libgo"
;;
Expand All @@ -350,7 +350,7 @@ index 54558df..a67df73 100644
noconfigdirs="$noconfigdirs target-libgo"
;;
*-*-aix*)
@@ -1174,7 +1174,7 @@ case "${target}" in
@@ -1178,7 +1178,7 @@ case "${target}" in
i[[3456789]]86-*-mingw*)
target_configdirs="$target_configdirs target-winsup"
;;
Expand All @@ -359,7 +359,7 @@ index 54558df..a67df73 100644
target_configdirs="$target_configdirs target-libtermcap target-winsup"
noconfigdirs="$noconfigdirs target-libgloss"
# always build newlib if winsup directory is present.
@@ -1318,7 +1318,7 @@ case "${host}" in
@@ -1322,7 +1322,7 @@ case "${host}" in
i[[3456789]]86-*-msdosdjgpp*)
host_makefile_frag="config/mh-djgpp"
;;
Expand All @@ -368,7 +368,7 @@ index 54558df..a67df73 100644
ACX_CHECK_CYGWIN_CAT_WORKS
host_makefile_frag="config/mh-cygwin"
;;
@@ -1805,7 +1805,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
@@ -1809,7 +1809,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
build_lto_plugin=yes
],[if test x"$default_enable_lto" = x"yes" ; then
case $target in
Expand All @@ -377,7 +377,7 @@ index 54558df..a67df73 100644
# On other non-ELF platforms, LTO has yet to be validated.
*) enable_lto=no ;;
esac
@@ -1816,7 +1816,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
@@ -1820,7 +1820,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
# warn during gcc/ subconfigure; unless you're bootstrapping with
# -flto it won't be needed until after installation anyway.
case $target in
Expand All @@ -386,7 +386,7 @@ index 54558df..a67df73 100644
*) if test x"$enable_lto" = x"yes"; then
AC_MSG_ERROR([LTO support is not enabled for this target.])
fi
@@ -1826,7 +1826,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
@@ -1830,7 +1830,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
# Among non-ELF, only Windows platforms support the lto-plugin so far.
# Build it unless LTO was explicitly disabled.
case $target in
Expand All @@ -395,7 +395,7 @@ index 54558df..a67df73 100644
*) ;;
esac
])
@@ -2640,7 +2640,7 @@ rm -f conftest*
@@ -2644,7 +2644,7 @@ rm -f conftest*
case "${host}" in
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
Expand All @@ -404,7 +404,7 @@ index 54558df..a67df73 100644
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
esac

@@ -3143,7 +3143,7 @@ case " $target_configdirs " in
@@ -3147,7 +3147,7 @@ case " $target_configdirs " in
case " $target_configargs " in
*" --with-newlib "*)
case "$target" in
Expand Down
Loading

0 comments on commit 79eddc9

Please sign in to comment.