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.

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

Make Godot compile on FreeBSD #100047

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Conversation

MBCX
Copy link
Contributor

@MBCX MBCX commented Dec 5, 2024

Fixes #67838, well, at least it does build on my dedicated FreeBSD 12.4 VM.

Some issues however:

  1. There are minor thirdparty code modifications, hopefully its acceptable. Committed the changed and also documented them in a diff file.
  2. Not a fan of having to import sys directly to specifically detect FreeBSD. Any other solution would be appreciated. Seems like the simplest solution for now.

I'll tackle OpenBSD on a separate PR once I have that set-up.

@MBCX MBCX requested review from a team as code owners December 5, 2024 14:11
@MBCX MBCX force-pushed the fix-freebsd-compilation branch from 0d02549 to d791e20 Compare December 5, 2024 14:16
@akien-mga akien-mga added bug platform:linuxbsd topic:buildsystem cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Dec 5, 2024
@akien-mga akien-mga added this to the 4.4 milestone Dec 5, 2024
@akien-mga
Copy link
Member

Not a fan of having to import sys directly to specifically detect FreeBSD. Any other solution would be appreciated.

Yeah it's a bit hacky and would break in cross-compilation (if there's any cross-compilation toolchain that targets FreeBSD).
But for now it's acceptable, *BSDs are supported on a best-effort basis so it's not unreasonable to expect users who want to target those platforms to build on the target platform.

@MBCX MBCX force-pushed the fix-freebsd-compilation branch from d791e20 to 6bc80ef Compare December 5, 2024 16:34
@MBCX
Copy link
Contributor Author

MBCX commented Dec 5, 2024

So for the thirdparty code, I kept the changes as Akien mentioned, but also created a diff file in the patches folder. Sounds good @adamscott?

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@akien-mga akien-mga requested a review from adamscott December 5, 2024 16:51
@Repiteo Repiteo merged commit 49e033f into godotengine:master Dec 5, 2024
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Dec 5, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release platform:linuxbsd topic:buildsystem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FreeBSD build failure: HAVE_SECURE_GETENV erroneously set for openxr dependency
4 participants