Skip to content

Commit 434066b

Browse files
author
Cyril Arnould
committed
Test for executable rather than installation
1 parent 756fcbd commit 434066b

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

pacman/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ sha256sums=('SKIP'
7979
'53c0c2d42bc10f265aa41bc412a6ebc2d98177d9356b0fa9a2a130caec46ac2d'
8080
'c12da01ede663a4924d0817a0d1bd6082b1380383cfb74cc1cea08f9d73e4902'
8181
'8cb6b244d39107afc6cff74d919708ffc58b903c42f82d050d1d49bbf31208ab'
82-
'91a3fa15bc0ba3e499c9ded87a85c9f4fffc8399dea8e1f4ae5d4f10ea2eda32'
82+
'6faceffbf98ef704ebd6b28399c9ad0c029a85164878bf2d0c2f6e7a8e5e13e9'
8383
'd272176dea508bf0972dde6396ca655e900d509099d0a496bd6a138f98bb48df'
8484
'7e2a2fc6799ed8a9dbc8b0712b162be963ed22351e4cb29b3a4d4a4d3f28d7ed'
8585
'953b66200dbe4f5b3a9caac2ce25f1ded7918232dce2e61b4bf64f5d87892d07'

pacman/makepkg-mingw

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,15 @@ for _mingw in ${MINGW_ARCH}; do
121121
'ucrt64')
122122
MINGW_PACKAGE_PREFIX='mingw-w64-ucrt-x86_64';;
123123
esac
124-
_installed_packages=$(pacman -Q)
125-
for _package in $_installed_packages; do
126-
if [ $_package = ${MINGW_PACKAGE_PREFIX}-file ]; then
127-
print_warning "${MINGW_PACKAGE_PREFIX}-file is installed, which is known to cause issues in package builds."
128-
fi
129-
if [ $_package = ${MINGW_PACKAGE_PREFIX}-grep ]; then
130-
print_warning "${MINGW_PACKAGE_PREFIX}-grep is installed, which is known to cause issues in package builds."
131-
fi
132-
if [ $_package = ${MINGW_PACKAGE_PREFIX}-sed ]; then
133-
print_warning "${MINGW_PACKAGE_PREFIX}-sed is installed, which is known to cause issues in package builds."
134-
fi
135-
done
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
136133

137134
print_msg2 "Building ${_mingw}..."
138135

0 commit comments

Comments
 (0)