Skip to content

Commit

Permalink
msys2-runtime: upgrade to v3.4.6
Browse files Browse the repository at this point in the history
This corresponds to
git-for-windows/msys2-runtime#50.

The `update-patches.sh` script had to be adjusted to reflect that Cygwin
changed its tag naming scheme. Before, it was `cygwin-<version>-release`
where the version had underscores instead of dots. Now, it is
`cygwin-<version>` with dots, not underscores. Also, the source URL
changed to `git+https` but we obviously cannot clone from such a URL.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
dscho committed May 12, 2023
1 parent 4548875 commit db517c2
Show file tree
Hide file tree
Showing 73 changed files with 1,398 additions and 10,160 deletions.
1,991 changes: 65 additions & 1,926 deletions msys2-runtime/0001-Add-MSYS2-triplet.patch

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e78e1440c29bc5340ef5403af120a3101e11361d Mon Sep 17 00:00:00 2001
From e6c92c6eaf63d328b94f7942a1173c2adb63f1f1 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
Expand All @@ -9,14 +9,14 @@ rename the output file name from `cygwin1.dll` to `msys-2.0.dll`.
Let's preemptively fix up all the import libraries that would link
against `msys_2_0.dll` to correctly link against `msys-2.0.dll` instead.
---
winsup/cygwin/speclib | 1 +
winsup/cygwin/scripts/speclib | 1 +
1 file changed, 1 insertion(+)

diff --git a/winsup/cygwin/speclib b/winsup/cygwin/speclib
index b900960..617a9c2 100755
--- a/winsup/cygwin/speclib
+++ b/winsup/cygwin/speclib
@@ -37,6 +37,7 @@ while (<$nm_fd>) {
diff --git a/winsup/cygwin/scripts/speclib b/winsup/cygwin/scripts/speclib
index e6d4d8e..4dcadcb 100755
--- a/winsup/cygwin/scripts/speclib
+++ b/winsup/cygwin/scripts/speclib
@@ -38,6 +38,7 @@ while (<$nm_fd>) {
study;
if (/ I _?(.*)_dll_iname/o) {
$dllname = $1;
Expand Down
Loading

0 comments on commit db517c2

Please sign in to comment.