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

Update scripts for new Fedora 39 based images for 4.2-beta3 and later #89

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Oct 24, 2023

Follow-up to godotengine/build-containers#128.

Also reverts #88 since these new images include JDK 17, and the closure compiler issue was fixed upstream.

And removes the manual install of gettext which is now also part of the images.

X11 libs should not be needed to generate the Mono glue anymore (they've been unnecessary for a while already).

Draft until I confirm that 4.2-beta3 builds fine with this.

Verified

This commit was signed with the committer’s verified signature.
docktermj Michael Dockter
Follow-up to godotengine/build-containers#128.

Also reverts #88 since these new images include JDK 17, and the closure
compiler issue was fixed upstream.

And removes the manual install of gettext which is now also part of the
images.

X11 libs should not be needed to generate the Mono glue anymore (they've been
unnecessary for a while already).
@akien-mga akien-mga marked this pull request as draft October 24, 2023 09:49
@akien-mga akien-mga marked this pull request as ready for review October 24, 2023 14:31
@akien-mga
Copy link
Member Author

Draft until I confirm that 4.2-beta3 builds fine with this.

Tested successfully.

@akien-mga akien-mga merged commit 93d2533 into main Oct 24, 2023
@akien-mga akien-mga deleted the f39-images branch October 24, 2023 14:31
Calinou pushed a commit to Calinou/godot-build-scripts that referenced this pull request Oct 25, 2023
Update scripts for new Fedora 39 based images for 4.2-beta3 and later
GodotBuilder pushed a commit that referenced this pull request Jan 17, 2024
Backport of #89 and #90, in sync with godotengine/build-containers#135.

In the 3.x branch, the situation with `arch` and `bits` is very brittle,
so we only add the explicit `arch` argument for the arm32/arm64 builds.
x86_32 still relies on `bits=32`.

This would all be worth refactoring upstream like we did for 4.0, but
it's a major undertaking and breaking change, which I'd prefer to avoid
in 3.6.

For Linux builds, we move the `strip` calls to the build stage, as this
needs to be done with the arch-appropriate `strip` binary, so it's easier
done there. In `master`, we now let the compiler strip during the build
with `-s`, but this change wasn't backported to 3.x.
GodotBuilder pushed a commit that referenced this pull request Jan 17, 2024
Backport of #89 and #90, in sync with godotengine/build-containers#135.

In the 3.x branch, the situation with `arch` and `bits` is very brittle,
so we only add the explicit `arch` argument for the arm32/arm64 builds.
x86_32 still relies on `bits=32`.

This would all be worth refactoring upstream like we did for 4.0, but
it's a major undertaking and breaking change, which I'd prefer to avoid
in 3.6.

For Linux builds, we move the `strip` calls to the link stage, as this
needs to be done with the arch-appropriate `strip` binary, so it's easier
done there. In `master`, we now let the compiler strip automatically
during the build if no debug symbols are requested, but this change
wasn't backported to 3.x.
GodotBuilder pushed a commit that referenced this pull request Jan 17, 2024
Backport of #89 and #90, in sync with godotengine/build-containers#135.

In the 3.x branch, the situation with `arch` and `bits` is very brittle,
so we only add the explicit `arch` argument for the arm32/arm64 builds.
x86_32 still relies on `bits=32`.

This would all be worth refactoring upstream like we did for 4.0, but
it's a major undertaking and breaking change, which I'd prefer to avoid
in 3.6.

For Linux builds, we move the `strip` calls to the link stage, as this
needs to be done with the arch-appropriate `strip` binary, so it's easier
done there. In `master`, we now let the compiler strip automatically
during the build if no debug symbols are requested, but this change
wasn't backported to 3.x.
GodotBuilder pushed a commit that referenced this pull request Jan 18, 2024
Backport of #89 and #90, in sync with godotengine/build-containers#135.

In the 3.x branch, the situation with `arch` and `bits` is very brittle,
so we only add the explicit `arch` argument for the arm32/arm64 builds.
x86_32 still relies on `bits=32`.

This would all be worth refactoring upstream like we did for 4.0, but
it's a major undertaking and breaking change, which I'd prefer to avoid
in 3.6.

For Linux builds, we move the `strip` calls to the link stage, as this
needs to be done with the arch-appropriate `strip` binary, so it's easier
done there. In `master`, we now let the compiler strip automatically
during the build if no debug symbols are requested, but this change
wasn't backported to 3.x.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant