Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding missing rpath to Python on Apple Silicon #1467

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Adding missing rpath to Python on Apple Silicon #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82558e7
Making Cairo a vcpkg dependency and setting rpath
colincornaby Aug 19, 2023
da88f3c
Removing Cairo install step via Homebrew
colincornaby Aug 19, 2023
5fbd30a
Treating Cairo as dependency of python3-cairosvg
colincornaby Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ jobs:
brew install \
autoconf \
automake \
cairo \
libtool \
nasm \
qt@5
Expand Down
1 change: 0 additions & 1 deletion Scripts/Ports/python3-cairosvg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"dependencies": [
{
"name": "cairo",
"platform": "windows",
"default-features": false
},
"python3"
Expand Down
4 changes: 4 additions & 0 deletions Scripts/Triplets/arm64-macos-plasma.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
4 changes: 4 additions & 0 deletions Scripts/Triplets/universal-macos-plasma.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Python documentation says that this should be CONFIGURE_LDFLAGS_NODIST

endif()

4 changes: 4 additions & 0 deletions Scripts/Triplets/x64-macos-plasma.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Python documentation says that this should be CONFIGURE_LDFLAGS_NODIST

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CONFIGURE_LDFLAGS_NODIST does not seem to work. Build fails when I switch to that argument.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the error?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the same error this is trying to fix in the Python Cairo module. It's as if no configure arguments are applied at all.

endif()
5 changes: 0 additions & 5 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down