forked from msys2/MSYS2-packages
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This finally makes the jump to v3.5.x, meaning that Git for Windows leaves Windows 7 and Windows 8 support behind. Signed-off-by: Johannes Schindelin <[email protected]>
- Loading branch information
Showing
91 changed files
with
1,044 additions
and
3,635 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From ea4541258abac6b47a0dfaf0ed48e07cc7d19caa Mon Sep 17 00:00:00 2001 | ||
From 51380ec75b3f11228cb680f3a4d71fc1957e5aec Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B8=CC=86=20=D0=9F?= | ||
=?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= <[email protected]> | ||
Date: Sun, 14 Apr 2019 20:40:45 +0300 | ||
|
@@ -197,10 +197,10 @@ index 4542a4b..209bd8d 100644 | |
esac | ||
if test x"${ac_cv_c_tkconfig}" = x ; then | ||
diff --git a/configure b/configure | ||
index eb0ba84..0badc34 100755 | ||
index 9477153..1474838 100755 | ||
--- a/configure | ||
+++ b/configure | ||
@@ -3074,7 +3074,7 @@ fi | ||
@@ -3088,7 +3088,7 @@ fi | ||
# Configure extra directories which are host specific | ||
|
||
case "${host}" in | ||
|
@@ -209,7 +209,7 @@ index eb0ba84..0badc34 100755 | |
configdirs="$configdirs libtermcap" ;; | ||
esac | ||
|
||
@@ -3595,7 +3595,7 @@ esac | ||
@@ -3609,7 +3609,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 | ||
|
@@ -218,7 +218,7 @@ index eb0ba84..0badc34 100755 | |
unsupported_languages="$unsupported_languages go" | ||
;; | ||
esac | ||
@@ -3608,7 +3608,7 @@ if test x$enable_libgo = x; then | ||
@@ -3622,7 +3622,7 @@ if test x$enable_libgo = x; then | ||
# PR 46986 | ||
noconfigdirs="$noconfigdirs target-libgo" | ||
;; | ||
|
@@ -227,7 +227,7 @@ index eb0ba84..0badc34 100755 | |
noconfigdirs="$noconfigdirs target-libgo" | ||
;; | ||
*-*-aix*) | ||
@@ -3880,7 +3880,7 @@ case "${target}" in | ||
@@ -3894,7 +3894,7 @@ case "${target}" in | ||
i[3456789]86-*-mingw*) | ||
target_configdirs="$target_configdirs target-winsup" | ||
;; | ||
|
@@ -236,7 +236,7 @@ index eb0ba84..0badc34 100755 | |
target_configdirs="$target_configdirs target-libtermcap target-winsup" | ||
noconfigdirs="$noconfigdirs target-libgloss" | ||
# always build newlib if winsup directory is present. | ||
@@ -4024,7 +4024,7 @@ case "${host}" in | ||
@@ -4038,7 +4038,7 @@ case "${host}" in | ||
i[3456789]86-*-msdosdjgpp*) | ||
host_makefile_frag="config/mh-djgpp" | ||
;; | ||
|
@@ -245,7 +245,7 @@ index eb0ba84..0badc34 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; } | ||
@@ -6192,7 +6192,7 @@ fi | ||
@@ -6206,7 +6206,7 @@ fi | ||
|
||
target_elf=no | ||
case $target in | ||
|
@@ -254,7 +254,7 @@ index eb0ba84..0badc34 100755 | |
*-msdosdjgpp* | *-vms* | *-wince* | *-*-pe* | \ | ||
alpha*-dec-osf* | hppa[12]*-*-hpux* | \ | ||
nvptx-*-none) | ||
@@ -6210,7 +6210,7 @@ if test $target_elf = yes; then : | ||
@@ -6224,7 +6224,7 @@ if test $target_elf = yes; then : | ||
else | ||
if test x"$default_enable_lto" = x"yes" ; then | ||
case $target in | ||
|
@@ -263,7 +263,7 @@ index eb0ba84..0badc34 100755 | |
# On other non-ELF platforms, LTO has yet to be validated. | ||
*) enable_lto=no ;; | ||
esac | ||
@@ -6221,7 +6221,7 @@ else | ||
@@ -6235,7 +6235,7 @@ else | ||
# warn during gcc/ subconfigure; unless you're bootstrapping with | ||
# -flto it won't be needed until after installation anyway. | ||
case $target in | ||
|
@@ -272,7 +272,7 @@ index eb0ba84..0badc34 100755 | |
*) if test x"$enable_lto" = x"yes"; then | ||
as_fn_error $? "LTO support is not enabled for this target." "$LINENO" 5 | ||
fi | ||
@@ -6231,7 +6231,7 @@ else | ||
@@ -6245,7 +6245,7 @@ else | ||
# Among non-ELF, only Windows platforms support the lto-plugin so far. | ||
# Build it unless LTO was explicitly disabled. | ||
case $target in | ||
|
@@ -281,7 +281,7 @@ index eb0ba84..0badc34 100755 | |
*) ;; | ||
esac | ||
|
||
@@ -7102,7 +7102,7 @@ rm -f conftest* | ||
@@ -7130,7 +7130,7 @@ rm -f conftest* | ||
case "${host}" in | ||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; | ||
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; | ||
|
@@ -290,7 +290,7 @@ index eb0ba84..0badc34 100755 | |
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;; | ||
esac | ||
|
||
@@ -7620,7 +7620,7 @@ case " $target_configdirs " in | ||
@@ -7648,7 +7648,7 @@ case " $target_configdirs " in | ||
case " $target_configargs " in | ||
*" --with-newlib "*) | ||
case "$target" in | ||
|
@@ -300,7 +300,7 @@ index eb0ba84..0badc34 100755 | |
;; | ||
esac | ||
diff --git a/configure.ac b/configure.ac | ||
index f1bb721..f7fc8e9 100644 | ||
index 05ddf69..3ed8a1b 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -409,7 +409,7 @@ AC_ARG_ENABLE(compressed_debug_sections, | ||
|
@@ -375,7 +375,7 @@ index f1bb721..f7fc8e9 100644 | |
*) ;; | ||
esac | ||
]) | ||
@@ -2644,7 +2644,7 @@ rm -f conftest* | ||
@@ -2652,7 +2652,7 @@ rm -f conftest* | ||
case "${host}" in | ||
*-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; | ||
*-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; | ||
|
@@ -384,7 +384,7 @@ index f1bb721..f7fc8e9 100644 | |
*) RPATH_ENVVAR=LD_LIBRARY_PATH ;; | ||
esac | ||
|
||
@@ -3157,7 +3157,7 @@ case " $target_configdirs " in | ||
@@ -3165,7 +3165,7 @@ case " $target_configdirs " in | ||
case " $target_configargs " in | ||
*" --with-newlib "*) | ||
case "$target" in | ||
|
@@ -795,10 +795,10 @@ index 5ef12ce..5e7bc34 100644 | |
AC_CHECK_TOOL(DLLTOOL, dlltool, false) | ||
AC_CHECK_TOOL(OBJDUMP, objdump, false) | ||
diff --git a/newlib/configure b/newlib/configure | ||
index 0b6ec15..d3171b4 100755 | ||
index 6a542bb..00de6b9 100755 | ||
--- a/newlib/configure | ||
+++ b/newlib/configure | ||
@@ -4269,7 +4269,7 @@ else | ||
@@ -4283,7 +4283,7 @@ else | ||
fi | ||
|
||
|
||
|
@@ -808,10 +808,10 @@ index 0b6ec15..d3171b4 100755 | |
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
diff --git a/newlib/configure.host b/newlib/configure.host | ||
index 32d1436..4e4c393 100644 | ||
index 3861834..2023e58 100644 | ||
--- a/newlib/configure.host | ||
+++ b/newlib/configure.host | ||
@@ -194,7 +194,7 @@ case "${host_cpu}" in | ||
@@ -195,7 +195,7 @@ case "${host_cpu}" in | ||
shared_machine_dir=shared_x86 | ||
# Don't use for these since they provide their own setjmp. | ||
case ${host} in | ||
|
@@ -820,7 +820,7 @@ index 32d1436..4e4c393 100644 | |
;; | ||
*) | ||
mach_add_setjmp=true | ||
@@ -399,7 +399,7 @@ fi | ||
@@ -407,7 +407,7 @@ fi | ||
|
||
if [ "x${newlib_mb}" = "x" ]; then | ||
case "${host}" in | ||
|
@@ -829,7 +829,7 @@ index 32d1436..4e4c393 100644 | |
newlib_mb=yes | ||
;; | ||
esac | ||
@@ -418,7 +418,7 @@ fi | ||
@@ -426,7 +426,7 @@ fi | ||
# THIS TABLE IS ALPHA SORTED. KEEP IT THAT WAY. | ||
|
||
case "${host}" in | ||
|
@@ -838,7 +838,7 @@ index 32d1436..4e4c393 100644 | |
posix_dir=posix | ||
xdr_dir=xdr | ||
;; | ||
@@ -578,7 +578,7 @@ esac | ||
@@ -589,7 +589,7 @@ esac | ||
# THIS TABLE IS ALPHA SORTED. KEEP IT THAT WAY. | ||
|
||
case "${host}" in | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 4fdf75c097dde04f825e2a8a433d28f7cf54e3ae Mon Sep 17 00:00:00 2001 | ||
From a116f418453dc6b272c3b58fcb1498790efccd6f Mon Sep 17 00:00:00 2001 | ||
From: Kaleb Barrett <[email protected]> | ||
Date: Sun, 14 Mar 2021 18:58:55 -0500 | ||
Subject: [PATCH 02/N] Fix msys library name in import libraries | ||
|
@@ -13,7 +13,7 @@ against `msys_2_0.dll` to correctly link against `msys-2.0.dll` instead. | |
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/winsup/cygwin/scripts/speclib b/winsup/cygwin/scripts/speclib | ||
index e6d4d8e..4dcadcb 100755 | ||
index 41a3a8e..42a02c5 100755 | ||
--- a/winsup/cygwin/scripts/speclib | ||
+++ b/winsup/cygwin/scripts/speclib | ||
@@ -38,6 +38,7 @@ while (<$nm_fd>) { | ||
|
Oops, something went wrong.