[staging] meson: 0.61.2 -> 0.63.0 #171069
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ah, conflict with staging due to #168753. That patch needs to be dropped with this bump. |
jtojnar
reviewed
May 1, 2022
|
(Testing some random build by creating a separate babllibcamera |
|
What a luck, will need to apply https://gitlab.gnome.org/GNOME/babl/-/commit/b05b2826365a7dbc6ca1bf0977b848055cd0cbb6. Also systemd is usually a good smoke screen. |
|
Built systemd locally. |
|
This also looks interesting for cross-compilation: 'Experimental command to convert environments to cross files' |
|
On macos 10.15: |
|
Think the issue is that mesonbuild/meson@68e684d is now included in 0.62.1 |
|
Actually think both those patches may now be included meaning this patch can be dropped? |
|
Built glib on x86_64-darwin |
|
I tried picking this into my cross-compilation branch, but for some reason it breaks libaom (both for cross and normal compilation). libaom doesn't directly depend on meson, so it puzzles me why it breaks. Since meson is the only diff I applied, I'm sure it's either flakiness or something related to this bump. Gonna restart the build to see if that helps, but noting it here already. If libaom is 'just' flaky, it'd be nice to fix that somewhere too (not here then of course). `libaom` build log |
|
Hmm that's interesting, I'll try to repro locally. FWIW, I based my commits on a staging-small eval, so it should be not too painful to build this PR branch without cherry-picking. |
|
Oh no, it didn't, but the results are different regardless. |
|
Other breakages I see: egl-wayland (cross)wayland-protocols (native & cross)swaybg (cross)swaylock (cross)Cannot definitely tell that this will be the same on this branch, but that's what I see. Mainly seems to revolve around that optimization flag together with _FORTIFY_SOURCE. Note that I'm mainly cross-compiling, so I give it a good chance native will see some of the same issues. |
|
0.62.2 was just released, maybe that's better? |
|
Sounds good, taking a look at 0.62.2. Seems like fluent-bit previously ran into the same FORTIFY_SOURCE issue: nixpkgs/pkgs/tools/misc/fluent-bit/default.nix Lines 40 to 41 in 48aef08 This seems to fix those builds, so I'll do the same for these packages unless there's a better fix |
AndersonTorres
approved these changes
Jun 18, 2022
13 tasks
|
@jtojnar I tried to bump to 0.63 and apply your upstream patch but couldn't build systemd with it: |
|
That’s weird. I guess for now, we can |
jtojnar
changed the title
|
Looks like the 0.62.2 broke bubblewrap: Possibly due to passing two variables to |
|
Confirmed that systemd, fwupd and gtk4 all build. |
|
@ofborg build pkgsCross.aarch64-multiplatform.networkmanager pkgsCross.aarch64-multiplatform.sway |
|
|
|
Looks like this is the issue https://gitlab.gnome.org/GNOME/gjs/-/issues/490 (mesonbuild/meson#10577). Likely will be fixed by #186797 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
https://mesonbuild.com/Release-notes-for-0-62-0.html
We can finally drop allow-dirs-outside-of-prefix.patch, as it has been accepted and merged upstream.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes