From 142a2e02b79bfb18d8c4e9c5498d8f7be8ab81d4 Mon Sep 17 00:00:00 2001 From: spiro-c Date: Tue, 18 Nov 2025 21:53:25 +1100 Subject: [PATCH 1/4] Intial push --- .github/workflows/build.yml | 25 +++++++ ...ylinux_2_28_aarch64-vcpkg-aubio.Dockerfile | 47 +++++++++++++ ...nylinux_2_28_x86_64-vcpkg-aubio.Dockerfile | 41 +++++++++++ pyproject.toml | 69 ++++++++++--------- vcpkg-triplets/arm64-linux-pic.cmake | 10 ++- vcpkg-triplets/x64-linux-pic.cmake | 7 ++ vcpkg.json | 41 +++-------- 7 files changed, 174 insertions(+), 66 deletions(-) create mode 100644 ci/manylinux_2_28_aarch64-vcpkg-aubio.Dockerfile create mode 100644 ci/manylinux_2_28_x86_64-vcpkg-aubio.Dockerfile diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a00073b7..39c84df60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,10 +61,12 @@ jobs: - os: ubuntu-latest arch: x86_64 cibw_archs: "x86_64" + container: "ci/manylinux_2_28_x86_64-vcpkg-aubio.Dockerfile" # Linux ARM64 (native, no QEMU) - os: ubuntu-24.04-arm arch: aarch64 cibw_archs: "aarch64" + container: "ci/manylinux_2_28_aarch64-vcpkg-aubio.Dockerfile" # Windows AMD64 - os: windows-latest arch: AMD64 @@ -88,9 +90,32 @@ jobs: with: submodules: 'recursive' + - name: Set up Docker Buildx + if: runner.os == 'Linux' + id: buildx + uses: docker/setup-buildx-action@v3 + with: + install: true + buildkitd-flags: --debug + + - name: Build Docker image with vcpkg and gdal + if: runner.os == 'Linux' + # using build-push-action (without push) to make use of cache arguments + uses: docker/build-push-action@v6 + with: + context: . + file: ${{ matrix.container }} + tags: manylinux-${{ matrix.arch }}-vcpkg-aubio:latest + push: false + load: true + cache-from: type=gha + cache-to: type=gha,mode=max + env: + BUILDKIT_PROGRESS: plain # Cache vcpkg_installed directory to avoid rebuilding dependencies # This caches the installed packages directory which is reused across builds - name: Cache vcpkg installed packages ${{ matrix.os }} ${{ matrix.arch }} + if: runner.os != 'Linux' uses: actions/cache@v4 with: path: ${{ github.workspace }}/vcpkg_installed diff --git a/ci/manylinux_2_28_aarch64-vcpkg-aubio.Dockerfile b/ci/manylinux_2_28_aarch64-vcpkg-aubio.Dockerfile new file mode 100644 index 000000000..3e54f7fa3 --- /dev/null +++ b/ci/manylinux_2_28_aarch64-vcpkg-aubio.Dockerfile @@ -0,0 +1,47 @@ +#This Dockerfile sets up a manylinux_2_28_aarch64 environment with vcpkg +# and installs aubio dependencies using a custom triplet. +# It is based on the official manylinux image and includes necessary +# tools and libraries for building Python wheels with aubio support. +# Use the latest stable manylinux_2_28_aarch64 image + +FROM quay.io/pypa/manylinux_2_28_aarch64:2025.11.11-1 + + +RUN dnf -y install curl zip unzip tar ninja-build git make nasm + +# Install vcpkg and checkout a specific commit for reproducibility +RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \ + git -C /opt/vcpkg checkout da096fdc67db437bee863ae73c4c12e289f82789 + +ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" +ENV PATH="${PATH}:/opt/vcpkg" + +ENV VCPKG_DEFAULT_TRIPLET="arm64-linux-pic" +# pkgconf fails to build with default debug mode of arm64-linux host +ENV VCPKG_DEFAULT_HOST_TRIPLET="arm64-linux-release" + +# Must be set when building on arm +ENV VCPKG_FORCE_SYSTEM_BINARIES=1 + +# mkdir & touch -> workaround for https://github.com/microsoft/vcpkg/issues/27786 +RUN bootstrap-vcpkg.sh && \ + mkdir -p /root/.vcpkg/ $HOME/.vcpkg && \ + touch /root/.vcpkg/vcpkg.path.txt $HOME/.vcpkg/vcpkg.path.txt && \ + vcpkg integrate install && \ + vcpkg integrate bash + +COPY vcpkg-triplets/arm64-linux-pic.cmake opt/vcpkg/custom-triplets/arm64-linux-pic.cmake +COPY vcpkg.json opt/vcpkg/ + +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/arm64-linux-pic/lib" +RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \ + --feature-flags="versions,manifests" \ + --x-manifest-root=opt/vcpkg \ + --x-install-root=opt/vcpkg/installed \ + --clean-after-build && \ + vcpkg list && \ + rm -rf /opt/vcpkg/buildtrees /opt/vcpkg/downloads +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/arm64-linux-pic/lib:/opt/vcpkg/installed/arm64-linux-release/lib" +# setting git safe directory is required for properly building wheels when +# git >= 2.35.3 +RUN git config --global --add safe.directory "*" \ No newline at end of file diff --git a/ci/manylinux_2_28_x86_64-vcpkg-aubio.Dockerfile b/ci/manylinux_2_28_x86_64-vcpkg-aubio.Dockerfile new file mode 100644 index 000000000..bc30f3073 --- /dev/null +++ b/ci/manylinux_2_28_x86_64-vcpkg-aubio.Dockerfile @@ -0,0 +1,41 @@ +#This Dockerfile sets up a manylinux_2_28_x86_64 environment with vcpkg +# and installs aubio dependencies using a custom triplet. +# It is based on the official manylinux image and includes necessary +# tools and libraries for building Python wheels with aubio support. +# Use the latest stable manylinux_2_28_x86_64 image + +FROM quay.io/pypa/manylinux_2_28_x86_64:2025.11.11-1 + + +RUN dnf -y install curl zip unzip tar ninja-build git make nasm +# Install vcpkg and checkout a specific commit for reproducibility +RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \ + git -C /opt/vcpkg checkout da096fdc67db437bee863ae73c4c12e289f82789 + +ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" +ENV PATH="${PATH}:/opt/vcpkg" + +ENV VCPKG_DEFAULT_TRIPLET="x64-linux-pic" + +# mkdir & touch -> workaround for https://github.com/microsoft/vcpkg/issues/27786 +RUN bootstrap-vcpkg.sh && \ + mkdir -p /root/.vcpkg/ $HOME/.vcpkg && \ + touch /root/.vcpkg/vcpkg.path.txt $HOME/.vcpkg/vcpkg.path.txt && \ + vcpkg integrate install && \ + vcpkg integrate bash + +COPY vcpkg-triplets/x64-linux-pic.cmake opt/vcpkg/custom-triplets/x64-linux-pic.cmake +COPY vcpkg.json opt/vcpkg/ + +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-pic/lib" +RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \ + --feature-flags="versions,manifests" \ + --x-manifest-root=opt/vcpkg \ + --x-install-root=opt/vcpkg/installed \ + --clean-after-build && \ + vcpkg list && \ + rm -rf /opt/vcpkg/buildtrees /opt/vcpkg/downloads +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-pic/lib:/opt/vcpkg/installed/x64-linux/lib" +# setting git safe directory is required for properly building wheels when +# git >= 2.35.3 +RUN git config --global --add safe.directory "*" diff --git a/pyproject.toml b/pyproject.toml index 51c3bac71..68544ab23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,8 @@ build = ["cp310-*", "cp311-*", "cp312-*", "cp313-*","cp314-*"] before-build = "pip install \"meson>=1.9.0\" meson-python ninja \"numpy>=1.26.4\"" # Skip 32-bit builds and musllinux wheels skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] - +manylinux-x86_64-image = "manylinux-x86_64-vcpkg-aubio:latest" +manylinux-aarch64-image = "manylinux-aarch64-vcpkg-aubio:latest" # Test the wheels - ensure they're portable by verifying imports work test-requires = ["pytest", "numpy>=1.26.4"] # First test: Verify aubio can be imported (ensures DLLs are bundled on Windows) @@ -77,42 +78,46 @@ build-frontend = { name = "pip", args = ["--no-build-isolation"] } # These are transitive dependencies of libsndfile[external-libs] that must be installed # to avoid undefined symbol errors during static linking before-all = """ - yum install -y git zip unzip tar curl make nasm && \ - if [ ! -d /tmp/vcpkg ]; then - git clone https://github.com/microsoft/vcpkg.git /tmp/vcpkg && \ - cd /tmp/vcpkg && ./bootstrap-vcpkg.sh -disableMetrics - fi && \ - if [ "$AUDITWHEEL_ARCH" = "x86_64" ]; then - VCPKG_TRIPLET=x64-linux-pic - elif [ "$AUDITWHEEL_ARCH" = "aarch64" ]; then - VCPKG_TRIPLET=arm64-linux-pic - else - echo "ERROR: Unknown architecture: $AUDITWHEEL_ARCH" - exit 1 - fi && \ - echo "=== Installing vcpkg dependencies for $AUDITWHEEL_ARCH (triplet: $VCPKG_TRIPLET) ===" && \ - cd {project} && \ - CC=/opt/rh/gcc-toolset-14/root/usr/bin/gcc \ - CXX=/opt/rh/gcc-toolset-14/root/usr/bin/g++ \ - VCPKG_BUILD_TYPE=release \ - /tmp/vcpkg/vcpkg install --triplet=$VCPKG_TRIPLET --overlay-triplets=./vcpkg-triplets --allow-unsupported && \ - echo "=== Vcpkg installation complete ===" && \ - echo "Installed packages in vcpkg_installed/$VCPKG_TRIPLET/:" && \ - ls -la {project}/vcpkg_installed/$VCPKG_TRIPLET/lib/pkgconfig/ 2>/dev/null || echo "No pkgconfig directory found" && \ - echo "Static libraries:" && \ - ls -la {project}/vcpkg_installed/$VCPKG_TRIPLET/lib/*.a 2>/dev/null | head -20 || echo "No static libraries found" + dnf install -y git zip unzip tar curl make nasm && \ + # if [ ! -d /tmp/vcpkg ]; then + # git clone https://github.com/microsoft/vcpkg.git /tmp/vcpkg && \ + # cd /tmp/vcpkg && ./bootstrap-vcpkg.sh -disableMetrics + # fi && \ + # if [ "$AUDITWHEEL_ARCH" = "x86_64" ]; then + # VCPKG_TRIPLET=x64-linux-pic + # elif [ "$AUDITWHEEL_ARCH" = "aarch64" ]; then + # VCPKG_TRIPLET=arm64-linux-pic + # else + # echo "ERROR: Unknown architecture: $AUDITWHEEL_ARCH" + # exit 1 + # fi && \ + # echo "=== Installing vcpkg dependencies for $AUDITWHEEL_ARCH (triplet: $VCPKG_TRIPLET) ===" && \ + # cd {project} && \ + # CC=/opt/rh/gcc-toolset-14/root/usr/bin/gcc \ + # CXX=/opt/rh/gcc-toolset-14/root/usr/bin/g++ \ + # VCPKG_BUILD_TYPE=release \ + # /tmp/vcpkg/vcpkg install --triplet=$VCPKG_TRIPLET --overlay-triplets=./vcpkg-triplets --allow-unsupported && \ + # echo "=== Vcpkg installation complete ===" && \ + # echo "Installed packages in vcpkg_installed/$VCPKG_TRIPLET/:" && \ + # ls -la {project}/vcpkg_installed/$VCPKG_TRIPLET/lib/pkgconfig/ 2>/dev/null || echo "No pkgconfig directory found" && \ + # echo "Static libraries:" && \ + # ls -la {project}/vcpkg_installed/$VCPKG_TRIPLET/lib/*.a 2>/dev/null | head -20 || echo "No static libraries found" """ [tool.cibuildwheel.linux.environment] # Set paths for both architectures - Meson will detect and use the correct one based on host_machine.cpu_family() # This works because only one triplet directory will exist (installed in before-all based on AUDITWHEEL_ARCH) -CMAKE_PREFIX_PATH = "{project}/vcpkg_installed/x64-linux-pic:{project}/vcpkg_installed/arm64-linux-pic" -PKG_CONFIG_PATH = "{project}/vcpkg_installed/x64-linux-pic/lib/pkgconfig:{project}/vcpkg_installed/x64-linux-pic/share/pkgconfig:{project}/vcpkg_installed/arm64-linux-pic/lib/pkgconfig:{project}/vcpkg_installed/arm64-linux-pic/share/pkgconfig" -# Use gcc-toolset-14 for C++17 support (required by rubberband) -CC = "/opt/rh/gcc-toolset-14/root/usr/bin/gcc" -CXX = "/opt/rh/gcc-toolset-14/root/usr/bin/g++" - - +# CMAKE_PREFIX_PATH = "{project}/vcpkg_installed/x64-linux-pic:{project}/vcpkg_installed/arm64-linux-pic" +# PKG_CONFIG_PATH = "{project}/vcpkg_installed/x64-linux-pic/lib/pkgconfig:{project}/vcpkg_installed/x64-linux-pic/share/pkgconfig:{project}/vcpkg_installed/arm64-linux-pic/lib/pkgconfig:{project}/vcpkg_installed/arm64-linux-pic/share/pkgconfig" +# # Use gcc-toolset-14 for C++17 support (required by rubberband) +# CC = "/opt/rh/gcc-toolset-14/root/usr/bin/gcc" +# CXX = "/opt/rh/gcc-toolset-14/root/usr/bin/g++" +VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/$VCPKG_DEFAULT_TRIPLET" +PKG_CONFIG_PATH = "$VCPKG_INSTALL/lib/pkgconfig:$VCPKG_INSTALL/share/pkgconfig:$VCPKG_INSTALL/lib/pkgconfig:$VCPKG_INSTALLATION_ROOT/installed/x64-linux-release/lib/pkgconfig:$VCPKG_INSTALLATION_ROOT/installed/x64-linux-release/share/pkgconfig" + +[[tool.cibuildwheel.overrides]] +select = "*-manylinux_aarch64*" +environment = { PKG_CONFIG_PATH = "$VCPKG_INSTALL/lib/pkgconfig:$VCPKG_INSTALL/share/pkgconfig:$VCPKG_INSTALL/lib/pkgconfig:$VCPKG_INSTALLATION_ROOT/installed/arm64-linux-release/lib/pkgconfig:$VCPKG_INSTALLATION_ROOT/installed/arm64-linux-release/share/pkgconfig" } [tool.cibuildwheel.windows] # Windows: Use vcpkg to install dependencies before building # GitHub Actions runners have vcpkg pre-installed at VCPKG_INSTALLATION_ROOT diff --git a/vcpkg-triplets/arm64-linux-pic.cmake b/vcpkg-triplets/arm64-linux-pic.cmake index 4ba72b2cd..b4950574a 100644 --- a/vcpkg-triplets/arm64-linux-pic.cmake +++ b/vcpkg-triplets/arm64-linux-pic.cmake @@ -4,10 +4,16 @@ set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) - set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) # Force position-independent code for all static libraries -# This is critical for FFmpeg and other dependencies when linking into shared libraries +# This is critical for linking into shared objects (.so files) set(VCPKG_C_FLAGS "-fPIC") set(VCPKG_CXX_FLAGS "-fPIC") +if(PORT MATCHES "ffmpeg") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() +if(PORT MATCHES "rubberband") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/vcpkg-triplets/x64-linux-pic.cmake b/vcpkg-triplets/x64-linux-pic.cmake index 873a4e63b..2550908e9 100644 --- a/vcpkg-triplets/x64-linux-pic.cmake +++ b/vcpkg-triplets/x64-linux-pic.cmake @@ -5,8 +5,15 @@ set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) +set(VCPKG_BUILD_TYPE release) # Force position-independent code for all static libraries # This is critical for linking into shared objects (.so files) set(VCPKG_C_FLAGS "-fPIC") set(VCPKG_CXX_FLAGS "-fPIC") +if(PORT MATCHES "ffmpeg") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() +if(PORT MATCHES "rubberband") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/vcpkg.json b/vcpkg.json index b7f3523e7..8e7489c72 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,44 +7,21 @@ "pkgconf", { "name": "libsndfile", - "default-features": false, - "features": ["external-libs"] + "default-features": false }, "libsamplerate", "fftw3", - { - "name": "mpg123", - "platform": "linux" - }, - { - "name": "mp3lame", - "platform": "linux" - }, - { - "name": "opus", - "platform": "linux" - }, - { - "name": "libogg", - "platform": "linux" - }, - { - "name": "libvorbis", - "platform": "linux" - }, - { - "name": "libflac", - "platform": "linux" - }, - { - "name": "rubberband", - "platform": "!linux" - }, + "libvorbis", + "rubberband", + "mp3lame", + "liblzma", + "opus", + "libogg", + "libflac", { "name": "ffmpeg", "default-features": false, - "features": ["avcodec", "avformat", "swresample"], - "platform": "!linux" + "features": ["avcodec", "avformat", "swresample"] } ] } From ac2a43118a3d9f12d8f64dcfd26826138f3bff70 Mon Sep 17 00:00:00 2001 From: spiro-c Date: Tue, 18 Nov 2025 22:07:35 +1100 Subject: [PATCH 2/4] Small fix --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 68544ab23..392c407b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,7 +78,7 @@ build-frontend = { name = "pip", args = ["--no-build-isolation"] } # These are transitive dependencies of libsndfile[external-libs] that must be installed # to avoid undefined symbol errors during static linking before-all = """ - dnf install -y git zip unzip tar curl make nasm && \ + dnf install -y git zip unzip tar curl make nasm # if [ ! -d /tmp/vcpkg ]; then # git clone https://github.com/microsoft/vcpkg.git /tmp/vcpkg && \ # cd /tmp/vcpkg && ./bootstrap-vcpkg.sh -disableMetrics From a33a2d46706f4edc04ba17dc58a869392b275ddd Mon Sep 17 00:00:00 2001 From: spiro-c Date: Tue, 18 Nov 2025 22:49:28 +1100 Subject: [PATCH 3/4] Try to cache arm64 linux --- .github/workflows/build.yml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39c84df60..1153860b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,16 @@ jobs: install: true buildkitd-flags: --debug - - name: Build Docker image with vcpkg and gdal + - name: Cache Docker layers + if: runner.os == 'Linux' + uses: actions/cache@v4 + with: + path: ${{ runner.temp }}/.buildx-cache + key: ${{ runner.os }}-${{ matrix.arch }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-${{ matrix.arch }}-buildx- + + - name: Build Docker image with vcpkg and aubio dependencies ${{ matrix.os }} ${{ matrix.arch }} if: runner.os == 'Linux' # using build-push-action (without push) to make use of cache arguments uses: docker/build-push-action@v6 @@ -108,10 +117,20 @@ jobs: tags: manylinux-${{ matrix.arch }}-vcpkg-aubio:latest push: false load: true - cache-from: type=gha - cache-to: type=gha,mode=max + cache-from: type=local,src=${{ runner.temp }}/.buildx-cache + cache-to: type=local,dest=${{ runner.temp }}/.buildx-cache-new,mode=max env: BUILDKIT_PROGRESS: plain + + # Temp fix + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + - name: Move cache + if: runner.os == 'Linux' + run: | + rm -rf ${{ runner.temp }}/.buildx-cache + mv ${{ runner.temp }}/.buildx-cache-new ${{ runner.temp }}/.buildx-cache + # Cache vcpkg_installed directory to avoid rebuilding dependencies # This caches the installed packages directory which is reused across builds - name: Cache vcpkg installed packages ${{ matrix.os }} ${{ matrix.arch }} From ed1d120cc8bcb8427c58987e99f5f473332a506b Mon Sep 17 00:00:00 2001 From: spiro-c Date: Wed, 19 Nov 2025 20:11:41 +1100 Subject: [PATCH 4/4] Better chache for windows --- .github/workflows/build.yml | 6 ++++-- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1153860b5..17af5f807 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,6 +69,7 @@ jobs: container: "ci/manylinux_2_28_aarch64-vcpkg-aubio.Dockerfile" # Windows AMD64 - os: windows-latest + triplet: x64-windows-release arch: AMD64 cibw_archs: "AMD64" # macOS x86_64 (Intel) @@ -145,18 +146,19 @@ jobs: - name: Install build tools (macOS) if: runner.os == 'macOS' run: | + echo "MACOSX_DEPLOYMENT_TARGET=${{ matrix.macoosx_deployment_target }}" >> $GITHUB_ENV # Install nasm (required by vcpkg for ffmpeg assembly optimizations) brew install nasm # macOS vcpkg setup - build dependencies from source with correct deployment target - name: Install vcpkg dependencies ${{ matrix.os }} ${{ matrix.arch }} - if: runner.os == 'macOS' + if: runner.os != 'Linux' + shell: bash env: VCPKG_BUILD_TYPE: "release" run: | echo "Building vcpkg dependencies for ${{ matrix.os }} ${{ matrix.arch }} with deployment target ${{ matrix.macoosx_deployment_target }}" $VCPKG_INSTALLATION_ROOT/vcpkg install --triplet=${{ matrix.triplet }} - echo "MACOSX_DEPLOYMENT_TARGET=${{ matrix.macoosx_deployment_target }}" >> $GITHUB_ENV echo "CMAKE_PREFIX_PATH=${{ github.workspace }}/vcpkg_installed/${{ matrix.triplet }}" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=${{ github.workspace }}/vcpkg_installed/${{ matrix.triplet }}/lib/pkgconfig:${{ github.workspace }}/vcpkg_installed/${{ matrix.triplet }}/share/pkgconfig" >> $GITHUB_ENV diff --git a/pyproject.toml b/pyproject.toml index 392c407b0..3b9e75f18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ environment = { PKG_CONFIG_PATH = "$VCPKG_INSTALL/lib/pkgconfig:$VCPKG_INSTALL/s # Use built-in triplet x64-windows-release for release-only builds with dynamic libs # (rubberband requires dynamic linking on Windows) before-all = [ - "cd {project} && if not exist vcpkg_installed %VCPKG_INSTALLATION_ROOT%\\vcpkg.exe install --triplet=x64-windows-release", + # "cd {project} && if not exist vcpkg_installed %VCPKG_INSTALLATION_ROOT%\\vcpkg.exe install --triplet=x64-windows-release", "dir {project}\\vcpkg_installed\\x64-windows-release\\lib\\pkgconfig", ]