diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e156cae12..2532f1e991 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -264,7 +264,6 @@ jobs: brew install \ autoconf \ automake \ - cairo \ libtool \ nasm \ qt@5 diff --git a/Scripts/Ports/python3-cairosvg/vcpkg.json b/Scripts/Ports/python3-cairosvg/vcpkg.json index d4c31833f4..da5cbbf1db 100644 --- a/Scripts/Ports/python3-cairosvg/vcpkg.json +++ b/Scripts/Ports/python3-cairosvg/vcpkg.json @@ -6,7 +6,6 @@ "dependencies": [ { "name": "cairo", - "platform": "windows", "default-features": false }, "python3" diff --git a/Scripts/Triplets/arm64-macos-plasma.cmake b/Scripts/Triplets/arm64-macos-plasma.cmake index 4ade46a0a8..b907bacaa4 100644 --- a/Scripts/Triplets/arm64-macos-plasma.cmake +++ b/Scripts/Triplets/arm64-macos-plasma.cmake @@ -12,3 +12,7 @@ if(PORT STREQUAL cairo) set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_BUILD_TYPE release) endif() + +if(PORT STREQUAL python3) + set(VCPKG_CONFIGURE_MAKE_OPTIONS "LDFLAGS_NODIST=-rpath ${CURRENT_INSTALLED_DIR}/lib") +endif() diff --git a/Scripts/Triplets/universal-macos-plasma.cmake b/Scripts/Triplets/universal-macos-plasma.cmake index bbdb989bcf..331385fc2e 100644 --- a/Scripts/Triplets/universal-macos-plasma.cmake +++ b/Scripts/Triplets/universal-macos-plasma.cmake @@ -13,3 +13,7 @@ if(PORT STREQUAL cairo) set(VCPKG_BUILD_TYPE release) endif() +if(PORT STREQUAL python3) + set(VCPKG_CONFIGURE_MAKE_OPTIONS "LDFLAGS_NODIST=-rpath ${CURRENT_INSTALLED_DIR}/lib") +endif() + diff --git a/Scripts/Triplets/x64-macos-plasma.cmake b/Scripts/Triplets/x64-macos-plasma.cmake index 8108a3314d..62c16ecebb 100644 --- a/Scripts/Triplets/x64-macos-plasma.cmake +++ b/Scripts/Triplets/x64-macos-plasma.cmake @@ -12,3 +12,7 @@ if(PORT STREQUAL cairo) set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_BUILD_TYPE release) endif() + +if(PORT STREQUAL python3) + set(VCPKG_CONFIGURE_MAKE_OPTIONS "LDFLAGS_NODIST=-rpath ${CURRENT_INSTALLED_DIR}/lib") +endif() diff --git a/vcpkg.json b/vcpkg.json index 10ba4baabe..ccd2c1573f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -52,11 +52,6 @@ "cairosvg": { "description": "Installs a functional cairosvg Python module for the resource.dat generator.", "dependencies": [ - { - "name": "cairo", - "platform": "windows", - "default-features": false - }, { "name": "python3-cairosvg", "host": true