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

Fix compilation in Xcode 15 #26

Merged
merged 4 commits into from
Nov 22, 2023
Merged

Fix compilation in Xcode 15 #26

merged 4 commits into from
Nov 22, 2023

Conversation

moffatman
Copy link
Contributor

Fix #25

  • Use a different approach for compiling towards simulator arm64, with the -target cflag
    • This results in dylib with the proper PLATFORM written by the linker
      • This was the issue in Issue building on M1 Mac #25, where intermediate link stages would fail as PLATFORM didn't match
      • We can now remove the post-processing step to rewrite PLATFORM on each dylib
    • Need to patch ltmain.sh in a few recipes to pass through -target to the linker
  • A few various patches to build flags to fix compilation errors

moffatman and others added 3 commits November 21, 2023 21:37
@moffatman
Add pkg-config in runner
d279d0d
@birros
Revert "Add pkg-config in runner"
e814f4f 
No need to add pkg-config to the system, since a custom version is used
to isolate the pipeline when building outside the CI.

This reverts commit d279d0d.
@birros
fix(ffmpeg): fix pkg-config binary search
5b38a99
@birros
Copy link
Member

birros commented Nov 22, 2023 •
edited
Loading

I don't understand how the CI could succeed in the past with find_program('pkgconfig') while the binary is called pkg-config 🤔

birros
birros approved these changes Nov 22, 2023
View reviewed changes
Copy link
Member

@birros birros left a comment

Choose a reason for hiding this comment

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

LGTM!

@moffatman moffatman merged commit ca4e7f9 into media-kit:main Nov 22, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@birros birros birros approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Issue building on M1 Mac
2 participants
@moffatman @birros