Skip to content

Commit 65c4e03

Browse files
committed
fix keyfinder build;
stopped working in alpine 3.22 due to switching to llvm, which strictly requres CXXFLAGS rather than CFLAGS the PKG_CONFIG_PATH change is unnecessary but might as well
1 parent c9fafb2 commit 65c4e03

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

bin/mtag/install-deps.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ set -e
2222
# modifies the keyfinder python lib to load the .so in ~/pe
2323

2424

25+
export FORCE_COLOR=1
26+
2527
linux=1
2628

2729
win=
@@ -186,12 +188,15 @@ install_keyfinder() {
186188
echo "so not found at $sop"
187189
exit 1
188190
}
189-
191+
192+
x=${-//[^x]/}; set -x; cat /etc/alpine-release
190193
# rm -rf /Users/ed/Library/Python/3.9/lib/python/site-packages/*keyfinder*
191194
CFLAGS="-I$h/pe/keyfinder/include -I/opt/local/include -I/usr/include/ffmpeg" \
195+
CXXFLAGS="-I$h/pe/keyfinder/include -I/opt/local/include -I/usr/include/ffmpeg" \
192196
LDFLAGS="-L$h/pe/keyfinder/lib -L$h/pe/keyfinder/lib64 -L/opt/local/lib" \
193-
PKG_CONFIG_PATH=/c/msys64/mingw64/lib/pkgconfig \
197+
PKG_CONFIG_PATH="/c/msys64/mingw64/lib/pkgconfig:$h/pe/keyfinder/lib/pkgconfig" \
194198
$pybin -m pip install --user keyfinder
199+
[ "$x" ] || set +x
195200

196201
pypath="$($pybin -c 'import keyfinder; print(keyfinder.__file__)')"
197202
for pyso in "${pypath%/*}"/*.so; do

0 commit comments

Comments
 (0)