5dea2a9351
* msys2-runtime: add a shell script to generate the patches from msys2/Cygwin The idea is to commit a change incrementing the `pkgver`, then running this script, and then amending the commit. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * msys2-runtime: work around Cygwin's source code containing symlinks It is a bit unfortunate that MSYS2 substitutes symlinks by deep copies, by default. Git, for example, claims that it cannot do symlinks, but Cygwin now needs this. Let's make do with that default. The strategy we use is simple: we override the auto-detected `core.symlinks` setting. That will result in a dirty worktree, of course: deep copies are not symlinks, and `git status` will detect it. But that does not matter, as the build will now work ("deep" copies of those header files will work just as well as real symlinks would have done). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> * msys2-runtime: upgrade to v3.1.4 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
27 lines
914 B
Diff
27 lines
914 B
Diff
From 4611822668f2df238c1b6d68a45c961437673776 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Pavlov <alexpux@gmail.com>
|
|
Date: Fri, 24 May 2019 13:41:47 +0300
|
|
Subject: [PATCH 17/N] QueryUnbiasedInterruptTime must be load from
|
|
kernel32.dll
|
|
|
|
---
|
|
winsup/cygwin/autoload.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
|
|
index 454bf51..8ce23ea 100644
|
|
--- a/winsup/cygwin/autoload.cc
|
|
+++ b/winsup/cygwin/autoload.cc
|
|
@@ -595,7 +595,7 @@ LoadDLLfunc (SetThreadGroupAffinity, 12, kernel32)
|
|
available via KernelBase.dll. */
|
|
LoadDLLfunc (QueryInterruptTime, 4, KernelBase)
|
|
LoadDLLfunc (QueryInterruptTimePrecise, 4, KernelBase)
|
|
-LoadDLLfunc (QueryUnbiasedInterruptTime, 4, KernelBase)
|
|
+LoadDLLfunc (QueryUnbiasedInterruptTime, 4, kernel32)
|
|
LoadDLLfunc (QueryUnbiasedInterruptTimePrecise, 4, KernelBase)
|
|
|
|
/* ldap functions are cdecl! */
|
|
--
|
|
2.26.2
|
|
|