Merge pull request #1467 from colincornaby/python-apple-silicon-rpath…

…-fix Adding missing rpath to Python on Apple Silicon
H-uru · Sep 6, 2023 · 4285442 · 4285442
2 parents 085186d + 5fbd30a
commit 4285442
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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