From 65c4e03574795f77afbe5378d4041a0f6497b5e0 Mon Sep 17 00:00:00 2001 From: ed Date: Sun, 22 Jun 2025 12:27:11 +0000 Subject: [PATCH] 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 --- bin/mtag/install-deps.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/mtag/install-deps.sh b/bin/mtag/install-deps.sh index 86ced92b..55473911 100755 --- a/bin/mtag/install-deps.sh +++ b/bin/mtag/install-deps.sh @@ -22,6 +22,8 @@ set -e # modifies the keyfinder python lib to load the .so in ~/pe +export FORCE_COLOR=1 + linux=1 win= @@ -186,12 +188,15 @@ install_keyfinder() { echo "so not found at $sop" exit 1 } - + + x=${-//[^x]/}; set -x; cat /etc/alpine-release # rm -rf /Users/ed/Library/Python/3.9/lib/python/site-packages/*keyfinder* CFLAGS="-I$h/pe/keyfinder/include -I/opt/local/include -I/usr/include/ffmpeg" \ + CXXFLAGS="-I$h/pe/keyfinder/include -I/opt/local/include -I/usr/include/ffmpeg" \ LDFLAGS="-L$h/pe/keyfinder/lib -L$h/pe/keyfinder/lib64 -L/opt/local/lib" \ - PKG_CONFIG_PATH=/c/msys64/mingw64/lib/pkgconfig \ + PKG_CONFIG_PATH="/c/msys64/mingw64/lib/pkgconfig:$h/pe/keyfinder/lib/pkgconfig" \ $pybin -m pip install --user keyfinder + [ "$x" ] || set +x pypath="$($pybin -c 'import keyfinder; print(keyfinder.__file__)')" for pyso in "${pypath%/*}"/*.so; do