Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

msys2-runtime: use the correct import library name

Browse Source 
This fixes https://github.com/msys2/msys2-runtime/issues/26

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2021-03-15 11:05:02 +01:00
parent 97bf817a86
commit b5829a87d0
37 changed files with 136 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msys2-runtime/0001-Add-MSYS2-triplet.patch
View File

@@ -2817,5 +2817,5 @@ index ff12dc2..cb45983 100644
install_host="install_host"
;;
--
2.29.2
2.30.2

2
msys2-runtime/0002-Rename-dll-from-cygwin-to-msys.patch
View File

@@ -1525,5 +1525,5 @@ index b96ad40..8ba5b9e 100644
}
if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))
--
2.29.2
2.30.2

2
msys2-runtime/0003-Add-functionality-for-converting-UNIX-paths-in-argum.patch
View File

@@ -1102,5 +1102,5 @@ index e3a65f8..1aeec8d 100644
{
for (int i = calloced; i < argc; i++)
--
2.29.2
2.30.2

2
msys2-runtime/0004-Add-functionality-for-changing-OS-name-via-MSYSTEM-e.patch
View File

@@ -187,5 +187,5 @@ index 3502166..28bcd63 100644
/* Add a hint to the sysname, that we're running under WOW64. This might
give an early clue if somebody encounters problems. */
--
2.29.2
2.30.2

2
msys2-runtime/0005-Move-root-to-usr.-Change-sorting-mount-points.-By-de.patch
View File

@@ -397,5 +397,5 @@ index c0a0f61..4c94d83 100644
free (gecos);
if (home)
--
2.29.2
2.30.2

2
msys2-runtime/0006-Do-not-create-cygwin-symlinks.-Instead-use-deep-copy.patch
View File

@@ -175,5 +175,5 @@ index 7ffb5bc..9b908ea 100644
buf = tp.t_get ();
cp = stpcpy (buf, SYMLINK_COOKIE);
--
2.29.2
2.30.2

2
msys2-runtime/0007-Automatically-rewrite-TERM-msys-to-TERM-cygwin-With-.patch
View File

@@ -35,5 +35,5 @@ index 87650cc..adc8884 100644
else if (*newp == 'M' && strncmp (newp, "MSYS=", 5) == 0)
parse_options (newp + 5);
--
2.29.2
2.30.2

2
msys2-runtime/0008-Do-not-convert-environment-for-strace.patch
View File

@@ -29,5 +29,5 @@ index e7a0810..426af44 100644
{
set_errno (E2BIG);
--
2.29.2
2.30.2

2
msys2-runtime/0009-Special-case-for-converting-root-directory-to-have-t.patch
View File

@@ -54,5 +54,5 @@ index 9b908ea..f592cb8 100644
}
--
2.29.2
2.30.2

2
msys2-runtime/0010-dcrt0.cc-Untangle-allow_glob-from-winshell.patch
View File

@@ -76,5 +76,5 @@ index b851727..c2da0cb 100644
/* Convert argv[0] to posix rules if it's currently blatantly
--
2.29.2
2.30.2

2
msys2-runtime/0011-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
View File

@@ -56,5 +56,5 @@ index c2da0cb..7ac8bf0 100644
size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
if (cnt <= 1 || cnt == (size_t)-1)
--
2.29.2
2.30.2

2
msys2-runtime/0012-strace.cc-Don-t-set-MSYS-noglob.patch
View File

@@ -68,5 +68,5 @@ index 8ba5b9e..e7ac668 100644
NULL, /* Security */
NULL, /* thread */
--
2.29.2
2.30.2

2
msys2-runtime/0013-Add-debugging-for-build_argv.patch
View File

@@ -21,5 +21,5 @@ index 7ac8bf0..4683972 100644
while (*cmd)
{
--
2.29.2
2.30.2

2
msys2-runtime/0014-Add-debugging-for-strace-make_command_line.patch
View File

@@ -20,5 +20,5 @@ index e7ac668..2fe3cac 100644
SetConsoleCtrlHandler (NULL, 0);
/* Commit message for this code was:
--
2.29.2
2.30.2

2
msys2-runtime/0015-environ.cc-New-facility-environment-variable-MSYS2_E.patch
View File

@@ -172,5 +172,5 @@ index 426af44..d8fc19c 100644
/* Check if we have been called from exec{lv}p or spawn{lv}p and mask
--
2.29.2
2.30.2

2
msys2-runtime/0016-Fix-native-symbolic-link-spawn-passing-wrong-arg0.patch
View File

@@ -21,5 +21,5 @@ index d8fc19c..0daac24 100644
if (buf.isdir ())
--
2.29.2
2.30.2

2
msys2-runtime/0017-QueryUnbiasedInterruptTime-must-be-load-from-kernel3.patch
View File

@@ -22,5 +22,5 @@ index 613a019..61c2808 100644
LoadDLLfunc (VirtualAlloc2, 28, kernelbase)
--
2.29.2
2.30.2

2
msys2-runtime/0018-fixup-Do-not-create-cygwin-symlinks.-Instead-use-dee.patch
View File

@@ -24,5 +24,5 @@ index 573a9b7..927efd8 100644
while (--pos >= 0)
if (isdirsep (newpath[pos]))
--
2.29.2
2.30.2

2
msys2-runtime/0019-strace-quiet-be-really-quiet.patch
View File

@@ -36,5 +36,5 @@ index 2fe3cac..25f8f6b 100644
SetConsoleCtrlHandler (NULL, 0);
/* Commit message for this code was:
--
2.29.2
2.30.2

2
msys2-runtime/0020-Default-to-disable_pcon.patch
View File

@@ -50,5 +50,5 @@ index 942bd1c..da82320 100644
bool NO_COPY in_forkee;
--
2.29.2
2.30.2

2
msys2-runtime/0021-Introduce-the-enable_pcon-value-for-MSYS.patch
View File

@@ -53,5 +53,5 @@ index 4b03836..3d57e34 100644
*k->setting.x &= ~k->values[istrue].i;
if (istrue || (eq && strtol (eq, NULL, 0)))
--
2.29.2
2.30.2

2
msys2-runtime/0022-Don-t-create-WSL-symlinks-for-MSYS2.patch
View File

@@ -44,5 +44,5 @@ index 927efd8..2dfe0ef 100644
default:
break;
--
2.29.2
2.30.2

2
msys2-runtime/0023-popen-call-usr-bin-sh-instead-of-bin-sh.patch
View File

@@ -30,5 +30,5 @@ index 186eeec..fdb49f3 100644
/* Reinstate the close-on-exec state */
--
2.29.2
2.30.2

2
msys2-runtime/0024-CI-add-a-GHA-for-doing-a-basic-build-test.patch
View File

@@ -40,5 +40,5 @@ index 0000000..c7ed476
+ make -j8
\ No newline at end of file
--
2.29.2
2.30.2

2
msys2-runtime/0025-Set-up-a-GitHub-Action-to-keep-in-sync-with-Cygwin.patch
View File

@@ -39,5 +39,5 @@ index 0000000..defcdf8
+ run: |
+ git push https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY refs/heads/cygwin/master 'refs/tags/*:refs/tags/*'
--
2.29.2
2.30.2

2
msys2-runtime/0026-recursiveCopy-Always-close-the-used-handle-with-Find.patch
View File

@@ -33,5 +33,5 @@ index 2dfe0ef..aa70113 100644
}
--
2.29.2
2.30.2

2
msys2-runtime/0027-fixup-Add-functionality-for-converting-UNIX-paths-in.patch
View File

@@ -43,5 +43,5 @@ index 0daac24..c77d629 100644
--
2.29.2
2.30.2

2
msys2-runtime/0028-Expose-full-command-lines-to-other-Win32-processes-b.patch
View File

@@ -52,5 +52,5 @@ index a52b6ac..de05270 100644
<listitem>
--
2.29.2
2.30.2

2
msys2-runtime/0029-Cygwin-pty-Prevent-garbled-output-when-pseudo-consol.patch
View File

@@ -28,5 +28,5 @@ index 43eebc1..b9cb45b 100644
void
--
2.29.2
2.30.2

2
msys2-runtime/0030-squash-Do-not-create-cygwin-symlinks.-Instead-use-de.patch
View File

@@ -223,5 +223,5 @@ index aa70113..e9ed30f 100644
/* Default technique creating a symlink. */
buf = tp.t_get ();
--
2.29.2
2.30.2

2
msys2-runtime/0031-fixup-Don-t-create-WSL-symlinks-for-MSYS2.patch
View File

@@ -57,5 +57,5 @@ index e9ed30f..38208fb 100644
default:
break;
--
2.29.2
2.30.2

2
msys2-runtime/0032-Cygwin-avoid-GCC-10-error-with-Werror-parentheses.patch
View File

@@ -23,5 +23,5 @@ index 2b50671..71e92e3 100644
/* Split a message into the least number of pieces to minimize the
number of WsaSendTo calls. Don't split datagram messages (bad idea).
--
2.29.2
2.30.2

2
msys2-runtime/0033-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch
View File

@@ -37,5 +37,5 @@ index 52741ce..afecb12 100644
{
WCHAR w = *(found + 1);
--
2.29.2
2.30.2

2
msys2-runtime/0034-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch
View File

@@ -45,5 +45,5 @@ index a230b35..cd4dff8 100644
#include <stdio.h>
--
2.29.2
2.30.2

34
msys2-runtime/0035-CI-Upload-the-build-artifacts.patch Normal file
View File

@@ -0,0 +1,34 @@
From fa13d627f515aeee14cd256ba658a02751330dbd Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 15 Mar 2021 08:54:00 +0100
Subject: [PATCH 35/N] CI: Upload the build artifacts
---
.github/workflows/build.yaml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c7ed476..ede8d53 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,4 +21,15 @@ jobs:
shell: msys2 {0}
run: |
./configure
- make -j8
\ No newline at end of file
+ make -j8
+
+ - name: Install
+ shell: msys2 {0}
+ run: |
+ make DESTDIR="$(pwd)"/_dest install
+
+ - name: Upload
+ uses: actions/upload-artifact@v2
+ with:
+ name: install
+ path: _dest/
--
2.30.2

25
msys2-runtime/0036-Fix-msys-library-name-in-import-libraries.patch Normal file
View File

@@ -0,0 +1,25 @@
From da111b9773a0e0ac72e0ac45fee51aaa18747a40 Mon Sep 17 00:00:00 2001
From: Kaleb Barrett <dev.ktbarrett@gmail.com>
Date: Sun, 14 Mar 2021 18:58:55 -0500
Subject: [PATCH 36/N] Fix msys library name in import libraries
Cygwin's speclib doesn't handle dashes or dots. So we specifically fix up all the import libraries that link against `msys_2_0.dll` to correctly link against `msys-2.0.dll`.
---
winsup/cygwin/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>) {
study;
if (/ I _?(.*)_dll_iname/o) {
$dllname = $1;
+ $dllname =~ s/_2_0/-2.0/;
} else {
my ($file, $member, $symbol) = m%^([^:]*):([^:]*(?=:))?.* T (.*)%o;
next if !defined($symbol) || $symbol =~ $exclude_regex;
--
2.30.2

80
msys2-runtime/PKGBUILD
View File

@@ -4,7 +4,7 @@
pkgbase=msys2-runtime
pkgname=('msys2-runtime' 'msys2-runtime-devel')
pkgver=3.1.7
pkgrel=4
pkgrel=5
pkgdesc="Cygwin POSIX emulation engine"
arch=('i686' 'x86_64')
url="https://www.cygwin.com/"
@@ -56,42 +56,46 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
0031-fixup-Don-t-create-WSL-symlinks-for-MSYS2.patch
0032-Cygwin-avoid-GCC-10-error-with-Werror-parentheses.patch
0033-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch
0034-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch)
0034-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch
0035-CI-Upload-the-build-artifacts.patch
0036-Fix-msys-library-name-in-import-libraries.patch)
sha256sums=('SKIP'
'f75aeb01a344ccd343c54102397c01f48a457700248c84e3fd1de1b01cc65de9'
'97ca79f280a10ffced9c3a97a321f004d5146d6da56fb8e6eb051f3c396b76fb'
'0790f926d2e0162d1475ec8ca659bdeeb8905308e972a1b03e3ac4dab62a9055'
'4c0dc2bf32ece594c63d40bcef677bfe00b138c42b8e77493b5a2d37f686a794'
'39bfc13b5cc19e2548d22b8e38de23ba7ffa035752041cb2719e783a0152c9fb'
'1e5782cf7b504771656fe34c2b51d10357836708fce74380c0c3dd2ed3bb93e6'
'459e8ce5d0a08738d3d29010e90f1a96dbcac3c74a3bdc9f750b7c99f5c1554c'
'5be89e3d9f7655fb2f76ad035fbc78230805aeadb73ee81989cebbd42868ba29'
'1bbbdf1355b150ba3048d3eed9f21affbdc8a925f45ab6e1190e3f76958ddcc2'
'8e03be072bb966a0547496db60b8b9b442131bd922ddf4af7df8d518707ebe3d'
'f63e95aca5245ef0d31b6bd305457f583b0ff3cf40b147f643550bd2d310fc55'
'2477201f5fce1b2f2931f8759120b528bdf81c6f10dc01c2a7cdbdf239158179'
'c11d291b9308779af68d1d130d553de0f197c5b8a09447b26babce1dce019aca'
'7fb82429612db338b6680b1a8886919b00d87d29c5eb08d2e120f3065289d4f0'
'14340d2c01fcda00fdce1305b0a7c417d6647daeb69459a4a0dbdef84c39a97d'
'612cb665f25f0b8cbc367e9412420a7ca1f247373f3dc3e9731fbf5a3f2957be'
'8de571deb59b1a2a172206519eae5d7bfaa32dbb1228352f0bccb95ef7fa4c59'
'819ab87b32ed7898470216e3fede55b45d2b69dd33f1504b8c27d7b4097a6184'
'f3c2096f5ca7d896fb6b9ecab4a51808d8a5a97300201767e520f8919119759d'
'9c2c84bce43f2333adfd4bde9dcd0f6e614e699ed9660504091c2dead2c28ba1'
'd9bc5d5ee444ac7d72d59f8f1bd8469898740806bff4cd4061d3f3314ad588ed'
'638b534c258d1627c2e3c03744248ef553b0c3ad66a18493506bee467435a32b'
'6ccb9e33aebdcb92dec079beeb72d3830f340d6cc1a9ef99a66ce9ed4ebfea22'
'd41db0f4fcc2f71e5bf7fc09f51e7b9a629f828b807f446529636ec5826ead78'
'bee112fdb7c8a0405f4b834e9a1d6ff8227612cd2690e73911c4f4c71767c138'
'61072fdd9fa31479994bf0f1539e6491cce2d7a9563319eba6b151e3b9a04434'
'fbfba1e066d3ac251ae8ddd4855a0d18d4c3d57d045c2759d4cb0badb0df8ead'
'c90830d4057ca243e424d922be5c1858a6ce9c415c74ca563bcfe69388c725bd'
'f4b2e908a46970df567be8a29d6b1d9809296532490cf9e3c171a5d4904a6166'
'6e879fcdffb36bbe0ef475b67eea1cc5e7c41c41ea0eceb76f75dff18eb2d2e1'
'32ea03ab654c37fd296a29b538e5dc4f21c44e2572613daffb6b3d21e7dff4d7'
'0d38735503540acb85a067cb6b1b2faf02a5eca32ab76964565bd8fc98944120'
'97c095263faf7193eb265c02ae83e66aad6d263c9e89c4901d2fdd1e0740f5fb'
'527373882204626bcd1d37b03db8d3e90ce8519438bcd72ff6a2d3dd5c4e029c')
'84bf13c5deefa35aaa53ad42e9c515414c70834e41c0afaf5950ac956541d452'
'305259abd8f74ddf7beffbf7983c55e966e87854623b0bec0b274af97a4a5126'
'9452ca1ba64e6051e5aaa638f493e55f5ac265668ce6fdf95da5e8ad2f108ddf'
'5f02b889c0139607a39cf4103896cb151bebeb179a4d83fe9827bf8c65edd477'
'78db0160e07137729d51b822228820f38486940e2838ddca5461bb3d67916e0a'
'bffddcf5f6ed1b7427b85e1610f26c4d126b88837a97d4f884baace7d99d63d3'
'3c9f2550615372a793f0d4d703a71745fa024f606b779d0ac7fd03e674b43345'
'5997bd18443da1b1f016684f0cc1215cc99e6b6606429784ab322d6266da0cc9'
'e00d4b6e58834527990cda7f3afa31996cab6c27d9502b6407735f4b4505deac'
'944755bf45e495d8407cb53467320d158f7010711bf5a334e8e908de1f6905e1'
'5f1d71d6083a25752525d5c3557670b065894155a07accbb6283e69f0cdc2db4'
'f2809fa78d45f1491fc720f94b01295e024a322bb3df524173cc091aba1e5e5f'
'6de8807d615f9c87cee6726a03bee51a4433a73a5931615de81b78507e1fe3f5'
'2321f4348b952569351ad9c77a39015fb37fad012e33573a225eceead9cf94c3'
'ce175ad58f94cbe6747ef5f79280e2399b5f092e4eac5db39e529836b5a2dc54'
'27c9a2b8b3883dab492c66965209d5569b8668ece3c47b18b6ab86ca70f30e8c'
'2a31ca793e9fd84fe7f2fdb2e68457bb381034cd53f10d00887550e9e529ffac'
'c725f9fe3c43326f3014a54733765b4e52610e513322bfad04c543691e00b0fe'
'daaa36b18adb580cb811a0197b85f97804e570108d61975e4cf7862b42cd1cd9'
'046a6dbb24d8ff554bdb12d2c4e18851fca914a61e6488d3c149e9b3e2327473'
'096583d58a280a0c0256847445d6c84fafaec8c1897568337d4f0416f5333325'
'fe5d8aff2d4d5f26137aab0166fa7f7d7387c8cfdb4fa670aee7dee2421dd22f'
'a005539be93f3f779cfdb90432002eb71be33b18eb11c9b57b7f865816402535'
'5ee7976d9919bcf8f65c546eee4ac63889cf773240db6ce12f2c81c4a98ed399'
'ec3353e8c3bb74eebdcfb96b6f6b44ed3a4fdcb84c002bf3c5cf71cbf7de6665'
'e6b1a34eae4ff68f4fe762c235c1589910dc3612032e8eacbe7f4b926b8e2604'
'98c1b657df8fb2b4215cdac2debd0eda70b6f527d76b2043948d533d32427de7'
'7d32d5afaa5ec645da5b4bbf3d4c27cac54f9f9cdf19c2b9a80bfe384b59a2bd'
'dd1aeea552c4b71479ea96bca040dda8a8fed6527e7adb51e533d85909f475d5'
'2c8a7acf7faa570e77c305b1fa821dd98d1c89e82bb99c26b76423e045704505'
'e02fa338f4a5dbd0578c24b24e1df43c7b0fe5f38714d186b81dba9e92b25851'
'e80eceb629147bf232d9b1b48d0311c196bf4d9e17a7d5be03543ad1bdb5bbe4'
'282e86372bf08b446109ea3a97fac84580c3089cf567a49ace5df561f521004e'
'bbe813d6e7620c485ccd90505a0e8190c9112dc7b9efa91942105ea8a58ccfc9'
'beb0f4f65af391468622b98d29d154fba6d2000ebc9ad4df686f9981b8cc61d9'
'f3e08ec0a99648a358e55c6e4a23065b1c1e8d07df759ae593a17e4e7fa478ae')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -162,7 +166,9 @@ prepare() {
0031-fixup-Don-t-create-WSL-symlinks-for-MSYS2.patch \
0032-Cygwin-avoid-GCC-10-error-with-Werror-parentheses.patch \
0033-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch \
0034-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch
0034-Cygwin-avoid-GCC-10-error-with-Werror-narrowing.patch \
0035-CI-Upload-the-build-artifacts.patch \
0036-Fix-msys-library-name-in-import-libraries.patch
}
build() {