1915a138c0
Same as #4584 but with an additional backport: https://github.com/msys2/msys2-pacman/pull/49 Old message: See msys2/msys2-pacman#45 makepkg.conf synced with the upstream version: https://gitlab.archlinux.org/pacman/pacman/-/blob/v6.1.0/etc/makepkg.conf.in Skip patches only changing CI configs
26 lines
949 B
Diff
26 lines
949 B
Diff
From 8ffa3e6af4f107638583a38de3e2276c80f24c5c Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Mon, 27 Feb 2023 18:51:05 +0100
|
|
Subject: [PATCH 08/N] makepkg: port staticlibs to Windows
|
|
|
|
---
|
|
scripts/libmakepkg/tidy/staticlibs.sh.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/libmakepkg/tidy/staticlibs.sh.in b/scripts/libmakepkg/tidy/staticlibs.sh.in
|
|
index 0315f7f..9d33384 100644
|
|
--- a/scripts/libmakepkg/tidy/staticlibs.sh.in
|
|
+++ b/scripts/libmakepkg/tidy/staticlibs.sh.in
|
|
@@ -35,9 +35,9 @@ tidy_staticlibs() {
|
|
msg2 "$(gettext "Removing static library files...")"
|
|
local l
|
|
while IFS= read -rd '' l; do
|
|
- if [[ -f "${l%.a}.so" || -h "${l%.a}.so" ]]; then
|
|
+ if [[ -f "${l%.a}.dll.a" || -h "${l%.a}.dll.a" ]]; then
|
|
rm "$l"
|
|
fi
|
|
- done < <(find . ! -type d -name "*.a" -print0)
|
|
+ done < <(find . ! -type d \( -name "*.a" ! -name "*.dll.a" \) -print0)
|
|
fi
|
|
}
|