Skip to content

macOS: Fix deps in preinstall, reenable arm64 builds #2393

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

Closed
wants to merge 1 commit into from
Closed

macOS: Fix deps in preinstall, reenable arm64 builds #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions .github/workflows/prebuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ jobs:
matrix:
node: [21]
canvas_tag: ["v3.0.0-rc2"] # e.g. "v2.6.1"
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS
runs-on: macos-12 # macos-14+ is M1
macos_version: ["13", "latest"] # macos-14+ is M1
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS ${{ matrix.macos_version }}
runs-on: macos-${{ matrix.macos_version }}
env:
CANVAS_VERSION_TO_BUILD: ${{ matrix.canvas_tag }}
steps:
Expand Down Expand Up @@ -174,7 +175,7 @@ jobs:

- name: Test binary
run: |
brew uninstall --force --ignore-dependencies cairo pango librsvg giflib harfbuzz
brew uninstall --force --ignore-dependencies cairo pango libpng jpeg giflib librsvg pixman harfbuzz
npm test

- name: Make bundle
Expand Down
7 changes: 5 additions & 2 deletions prebuild/macOS/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
'<!@(pkg-config pangocairo --libs)',
'<!@(pkg-config freetype2 --libs)',
'<!@(pkg-config librsvg-2.0 --libs)',
'-ljpeg',
'<!@(pkg-config libjpeg --libs)',
'-L<!(brew --prefix)/lib',
'-lgif'
],
'include_dirs': [
Expand All @@ -43,7 +44,9 @@
'<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
'<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',
'<!@(pkg-config freetype2 --cflags-only-I | sed s/-I//g)',
'<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)'
'<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)',
'<!@(pkg-config libjpeg --cflags-only-I | sed s/-I//g)',
'<!(brew --prefix)/include'
],
'cflags+': ['-fvisibility=hidden'],
'xcode_settings': {
Expand Down
2 changes: 1 addition & 1 deletion prebuild/macOS/preinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ rm -f /usr/local/bin/python3-config || :

# two or more of these packages have python3 as a dependency, and --overwrite
# doesn't work to make them ignore conflicts. For now just ignore errors, yolo.
brew install --force pkg-config cairo pango librsvg giflib || :
brew install --force pkg-config cairo pango libpng jpeg giflib librsvg pixman || :

pip3 install --user --break-system-packages macpack