From b68d1f8b8ed2985856c4019631cefa3a29214e25 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 30 Nov 2024 17:56:50 +1100 Subject: [PATCH] Use libdir --- .github/workflows/wheels-dependencies.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 587cc7259b0..3c104317c21 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -142,11 +142,10 @@ function build_libavif { fi local out_dir=$(fetch_unpack https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$LIBAVIF_VERSION.tar.gz libavif-$LIBAVIF_VERSION.tar.gz) - (cd $out_dir \ && cmake \ -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \ - -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib \ + -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=OFF \ -DAVIF_LIBSHARPYUV=LOCAL \ @@ -159,11 +158,6 @@ function build_libavif { -DCMAKE_MODULE_PATH=/tmp/cmake/Modules \ . \ && make install) - - if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp /usr/local/lib64/libavif.a /usr/local/lib - cp /usr/local/lib64/pkgconfig/libavif.pc /usr/local/lib/pkgconfig - fi touch libavif-stamp }