Update msys2-runtime-3.3
This commit is contained in:
Christoph Reiter
parent
b0c1af6f3b
commit
b61fe82be4
@ -0,0 +1,47 @@
|
||||
From 5f8eaff6c86f890ec2fcc366d4d7b9b7050e6bc2 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
||||
Date: Tue, 31 Jan 2023 09:32:08 +0100
|
||||
Subject: [PATCH 47/N] dumper: avoid linker problem when `libbfd` depends on
|
||||
`libsframe`
|
||||
|
||||
A recent binutils version introduced `libsframe` and made it a
|
||||
dependency of `libbfd`. Which means that we have to link that library
|
||||
into `dumper.exe`, too, if it exists.
|
||||
|
||||
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
||||
---
|
||||
winsup/configure.ac | 5 +++++
|
||||
winsup/utils/Makefile.am | 4 ++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/winsup/configure.ac b/winsup/configure.ac
|
||||
index 5eb3273..ca2b8c0 100644
|
||||
--- a/winsup/configure.ac
|
||||
+++ b/winsup/configure.ac
|
||||
@@ -110,6 +110,11 @@ AC_CHECK_LIB([bfd], [bfd_init], [true],
|
||||
|
||||
AM_CONDITIONAL(BUILD_DUMPER, [test "x$ac_cv_lib_bfd_bfd_init" = "xyes"])
|
||||
|
||||
+AC_CHECK_LIB([sframe], [sframe_decode],
|
||||
+ AC_MSG_NOTICE([Detected libsframe; Assuming that libbfd depends on it]), [true])
|
||||
+
|
||||
+AM_CONDITIONAL(HAVE_LIBSFRAME, [test "x$ac_cv_lib_sframe_sframe_decode" = "xyes"])
|
||||
+
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
cygwin/Makefile
|
||||
diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am
|
||||
index e12dfdd..08f6212 100644
|
||||
--- a/winsup/utils/Makefile.am
|
||||
+++ b/winsup/utils/Makefile.am
|
||||
@@ -87,6 +87,10 @@ profiler_CXXFLAGS = -I$(srcdir) -idirafter ${top_srcdir}/cygwin -idirafter ${top
|
||||
profiler_LDADD = $(LDADD) -lntdll
|
||||
cygps_LDADD = $(LDADD) -lpsapi -lntdll
|
||||
|
||||
+if HAVE_LIBSFRAME
|
||||
+dumper_LDADD += -lsframe
|
||||
+endif
|
||||
+
|
||||
if CROSS_BOOTSTRAP
|
||||
SUBDIRS = mingw
|
||||
endif
|
||||
@ -0,0 +1,24 @@
|
||||
From 91dcbe36f2fbeadc96362c7ad28c18eca90c44e6 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Reiter <reiter.christoph@gmail.com>
|
||||
Date: Wed, 29 Mar 2023 10:52:43 +0200
|
||||
Subject: [PATCH 48/N] CI: build with --disable-dependency-tracking
|
||||
|
||||
We only build once in CI, so dependency tracking isn't needed.
|
||||
This saves 3-4 minutes in CI.
|
||||
---
|
||||
.github/workflows/build.yaml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
|
||||
index 5069dbd..1775bb9 100644
|
||||
--- a/.github/workflows/build.yaml
|
||||
+++ b/.github/workflows/build.yaml
|
||||
@@ -21,7 +21,7 @@ jobs:
|
||||
shell: msys2 {0}
|
||||
run: |
|
||||
(cd winsup && ./autogen.sh)
|
||||
- ./configure
|
||||
+ ./configure --disable-dependency-tracking
|
||||
make -j8
|
||||
|
||||
- name: Install
|
||||
@ -0,0 +1,44 @@
|
||||
From c86ff309dd42a57dc2f1113b1266e36c01b8c97f Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
||||
Date: Wed, 18 Feb 2015 10:45:01 +0000
|
||||
Subject: [PATCH 49/N] Stop assuming that there are no spaces in POSIX-style
|
||||
paths
|
||||
|
||||
Git's test suite most prominently sports a POSIX path with a space in
|
||||
it: the tests are executed in directories whose names have the form
|
||||
'trash directory.t0123-blub'. Therefore, we *must* handle those names
|
||||
correctly.
|
||||
|
||||
This fix makes Git's t1504-ceiling-dirs.sh pass.
|
||||
|
||||
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
||||
---
|
||||
winsup/cygwin/msys2_path_conv.cc | 8 +-------
|
||||
1 file changed, 1 insertion(+), 7 deletions(-)
|
||||
|
||||
diff --git a/winsup/cygwin/msys2_path_conv.cc b/winsup/cygwin/msys2_path_conv.cc
|
||||
index b8f280b..ebf47d6 100644
|
||||
--- a/winsup/cygwin/msys2_path_conv.cc
|
||||
+++ b/winsup/cygwin/msys2_path_conv.cc
|
||||
@@ -201,7 +201,7 @@ void ppl_convert(const char** from, const char* to, char** dst, const char* dste
|
||||
|
||||
|
||||
void find_end_of_posix_list(const char** to, int* in_string) {
|
||||
- for (; **to != '\0' && (in_string ? (**to != *in_string) : **to != ' '); ++*to) {
|
||||
+ for (; **to != '\0' && (!in_string || **to != *in_string); ++*to) {
|
||||
}
|
||||
|
||||
if (**to == *in_string) {
|
||||
@@ -301,12 +301,6 @@ const char* convert(char *dst, size_t dstlen, const char *src) {
|
||||
}
|
||||
continue;
|
||||
}
|
||||
-
|
||||
- if (isspace(*srcit)) {
|
||||
- //sub_convert(&srcbeg, &srcit, &dstit, dstend, &in_string);
|
||||
- //srcbeg = srcit + 1;
|
||||
- break;
|
||||
- }
|
||||
}
|
||||
|
||||
sub_convert(&srcbeg, &srcit, &dstit, dstend, &in_string);
|
||||
@ -4,7 +4,7 @@
|
||||
pkgbase=msys2-runtime-3.3
|
||||
pkgname=('msys2-runtime-3.3' 'msys2-runtime-3.3-devel')
|
||||
pkgver=3.3.6
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="Cygwin POSIX emulation engine"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.cygwin.com/"
|
||||
@ -70,7 +70,10 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
|
||||
0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch
|
||||
0044-amend-Special-case-for-converting-root-directory-to-.patch
|
||||
0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch
|
||||
0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch)
|
||||
0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch
|
||||
0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch
|
||||
0048-CI-build-with-disable-dependency-tracking.patch
|
||||
0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch)
|
||||
sha256sums=('SKIP'
|
||||
'c375315e58181ee5589b7966101aa095de3f864a579c3c3f0f0683595d4e428d'
|
||||
'01ea2b131cf5a3b27fdbc458019eac14e45a36782ce3ce33e62328eefcd2d02e'
|
||||
@ -117,7 +120,10 @@ sha256sums=('SKIP'
|
||||
'6d062c34feca04b5dbd38273f8bb7d270947a368ade550fdfc8b11f0daa1a17c'
|
||||
'0454442f2ad3312df83ec86bf872b5ad0bc1c014ed13dad1fbac7dd8e8de8f7a'
|
||||
'61276aec4c9b7132487fd1d91e6c5991a24909f24a6de0312f62f1f99608e9c0'
|
||||
'202f3aaf82e001f7972d5d73152c424858d193108372453a52dbe6ab05b08922')
|
||||
'202f3aaf82e001f7972d5d73152c424858d193108372453a52dbe6ab05b08922'
|
||||
'5647a4675b1f1f7c0a221f077d1d892c3e6bdb0635b2b23563838fe8ebfe0637'
|
||||
'c209bb6147094390e71d024367859f04e112eb2c90cbb289b24c4903224b2ae8'
|
||||
'5e690151d40a180138e198b19200b2e9840a9d4510da21896b027dc6b8e47f7d')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@ -200,7 +206,10 @@ prepare() {
|
||||
0043-When-converting-to-a-Unix-path-avoid-double-trailing.patch \
|
||||
0044-amend-Special-case-for-converting-root-directory-to-.patch \
|
||||
0045-msys2_path_conv-pass-PC_NOFULL-to-path_conv.patch \
|
||||
0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch
|
||||
0046-Cygwin-Implicitly-support-the-dev-fd-symlink-and-fri.patch \
|
||||
0047-dumper-avoid-linker-problem-when-libbfd-depends-on-l.patch \
|
||||
0048-CI-build-with-disable-dependency-tracking.patch \
|
||||
0049-Stop-assuming-that-there-are-no-spaces-in-POSIX-styl.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user