Skip to content

Commit e6ef56b

Browse files
author
Cyril Arnould
committed
Add warning to makepkg-mingw if mingw-w64-file/grep/sed are installed
1 parent 7eec4fa commit e6ef56b

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

pacman/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
pkgname=pacman
66
pkgver=6.0.2
7-
pkgrel=13
7+
pkgrel=14
88
pkgdesc="A library-based package manager with dependency support (MSYS2 port)"
99
arch=('i686' 'x86_64')
1010
url="https://www.archlinux.org/pacman/"
@@ -81,7 +81,7 @@ sha256sums=('SKIP'
8181
'53c0c2d42bc10f265aa41bc412a6ebc2d98177d9356b0fa9a2a130caec46ac2d'
8282
'c12da01ede663a4924d0817a0d1bd6082b1380383cfb74cc1cea08f9d73e4902'
8383
'a84354e88f6b0cae3a8005a944fcd88819a0860f4440501cc6f1c1f9abfe87c4'
84-
'98198e1f0f252eae0560d271bee4b9149e127399dd0d3fd5d8d24579d9e0550f'
84+
'6faceffbf98ef704ebd6b28399c9ad0c029a85164878bf2d0c2f6e7a8e5e13e9'
8585
'd272176dea508bf0972dde6396ca655e900d509099d0a496bd6a138f98bb48df'
8686
'7e2a2fc6799ed8a9dbc8b0712b162be963ed22351e4cb29b3a4d4a4d3f28d7ed'
8787
'953b66200dbe4f5b3a9caac2ce25f1ded7918232dce2e61b4bf64f5d87892d07'

pacman/makepkg-mingw

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,31 @@ fi
106106
print_msg1 "MINGW_ARCH: ${MINGW_ARCH}"
107107

108108
for _mingw in ${MINGW_ARCH}; do
109+
# Check if problematic packages are installed
110+
case $_mingw in
111+
'mingw32')
112+
MINGW_PACKAGE_PREFIX='mingw-w64-i686';;
113+
'mingw64')
114+
MINGW_PACKAGE_PREFIX='mingw-w64-x86_64';;
115+
'clang32')
116+
MINGW_PACKAGE_PREFIX='mingw-w64-clang-i686';;
117+
'clang64')
118+
MINGW_PACKAGE_PREFIX='mingw-w64-clang-x86_64';;
119+
'clangarm64')
120+
MINGW_PACKAGE_PREFIX='mingw-w64-clang-aarch64';;
121+
'ucrt64')
122+
MINGW_PACKAGE_PREFIX='mingw-w64-ucrt-x86_64';;
123+
esac
124+
if test -f "/${_mingw}/bin/file.exe"; then
125+
print_warning "${MINGW_PACKAGE_PREFIX}-file is installed, which is known to cause issues in package builds."
126+
fi
127+
if test -f "/${_mingw}/bin/grep.exe"; then
128+
print_warning "${MINGW_PACKAGE_PREFIX}-grep is installed, which is known to cause issues in package builds."
129+
fi
130+
if test -f "/${_mingw}/bin/sed.exe"; then
131+
print_warning "${MINGW_PACKAGE_PREFIX}-sed is installed, which is known to cause issues in package builds."
132+
fi
133+
109134
print_msg2 "Building ${_mingw}..."
110135

111136
MSYSTEM="${_mingw^^}" \

0 commit comments

Comments
 (0)