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

meson: 1.4.0 -> 1.4.1 #316178

Merged
merged 1 commit into from
Jun 27, 2024
Merged

meson: 1.4.0 -> 1.4.1 #316178

merged 1 commit into from
Jun 27, 2024

Conversation

alyssais
Copy link
Member

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais changed the base branch from master to staging May 31, 2024 14:53
@JohnRTitor
Copy link
Contributor

@ofborg build meson

@JohnRTitor JohnRTitor requested a review from vcunat May 31, 2024 19:51
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM.
Needs some Darwin and some BSD to test.

@alyssais
Copy link
Member Author

Needs some Darwin and some BSD to test.

cc @rhelmot @NixOS/darwin-maintainers

@DontEatOreo
Copy link
Member

Sorry @JohnRTitor, I don't have enough storage on my computer to build this...

image

@DontEatOreo DontEatOreo removed their request for review June 26, 2024 11:39
@stepbrobd
Copy link
Member

Currently building mpd on aarch64-darwin, it'll probably take a couple hours

@reckenrode
Copy link
Contributor

reckenrode commented Jun 26, 2024

Because the Darwin stdenv bootstrap requires Meson (for libiconv and system_cmds), if it gets to the point where ofborg times out building LLVM, then it was able to successfully build Meson on Darwin.

Looking at the logs, it appears that was the case here.

@stepbrobd
Copy link
Member

meson 1.4.1 and llvm 16 build just fine on aarch64-darwin

@JohnRTitor
Copy link
Contributor

JohnRTitor commented Jun 27, 2024

Fails to build binutils in the nix community builder (aarch64-darwin).

johnrtitor@darwin01 ~ % nix build "github:nixos/nixpkgs/refs/pull/316178/merge#meson"

error: builder for '/nix/store/1mqan5la0b6qy0a3ya0wq2yzfdga7w1i-binutils-2.42.drv' failed with exit code 2;
       last 10 log lines:
       > clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
       > make[4]: *** [Makefile:747: libctf-nobfd.la] Error 1
       > make[4]: Leaving directory '/private/tmp/nix-build-binutils-2.42.drv-0/binutils-2.42/libctf'
       > make[3]: *** [Makefile:1250: all-recursive] Error 1
       > make[3]: Leaving directory '/private/tmp/nix-build-binutils-2.42.drv-0/binutils-2.42/libctf'
       > make[2]: *** [Makefile:646: all] Error 2
       > make[2]: Leaving directory '/private/tmp/nix-build-binutils-2.42.drv-0/binutils-2.42/libctf'
       > make[1]: *** [Makefile:10168: all-libctf] Error 2
       > make[1]: Leaving directory '/private/tmp/nix-build-binutils-2.42.drv-0/binutils-2.42'
       > make: *** [Makefile:1031: all] Error 2
       For full logs, run 'nix log /nix/store/1mqan5la0b6qy0a3ya0wq2yzfdga7w1i-binutils-2.42.drv'.
error: 1 dependencies of derivation '/nix/store/fas14mfsabc5x7dznvbypdqz7wswjnzh-cctools-binutils-darwin-16.0.6-973.0.1.drv' failed to build

Cause:

  CCLD     libctf.la
  CCLD     libctf-nobfd.la
Undefined symbols for architecture arm64:
  "_ctf_open", referenced from:
      _ctf_link_add_ctf in libctf_nobfd_la-ctf-link.o
      _ctf_link_deduplicating_count_inputs in libctf_no>
ld: symbol(s) not found for architecture arm64
clang-16: error: linker command failed with exit code 1>
make[4]: *** [Makefile:747: libctf-nobfd.la] Error 1
make[4]: Leaving directory '/private/tmp/nix-build-binu>
make[3]: *** [Makefile:1250: all-recursive] Error 1
make[3]: Leaving directory '/private/tmp/nix-build-binu>
make[2]: *** [Makefile:646: all] Error 2
make[2]: Leaving directory '/private/tmp/nix-build-binu>
make[1]: *** [Makefile:10168: all-libctf] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-binu>
make: *** [Makefile:1031: all] Error 2

@K900
Copy link
Contributor

K900 commented Jun 27, 2024

Fixed on -next.

@emilazy
Copy link
Member

emilazy commented Jun 27, 2024

I think we have sufficient confidence that this is fine on macOS and we don’t need to block further on that.

@JohnRTitor JohnRTitor merged commit 3c0b7e1 into NixOS:staging Jun 27, 2024
34 checks passed
@stepbrobd
Copy link
Member

Quick question: why would nix build .#meson build after gh pr checkout 316178 while nix build "github:nixos/nixpkgs/refs/pull/316178/merge#meson" fails to build? Aren't they supposed to build the same thing?

@emilazy
Copy link
Member

emilazy commented Jun 27, 2024

The former would correspond to /head rather than /merge, so the latter was trying to build the whole broken stdenv bootstrap stuff currently on staging (because that’s the target of this PR), whereas the branch itself was presumably based on an earlier revision of master for easy testing (I didn’t actually check, but that’s how I do it).

@JohnRTitor
Copy link
Contributor

Yup, nix build "github:nixos/nixpkgs/refs/pull/316178/merge#meson" should be fixed in its next merge with staging-next

@alyssais alyssais deleted the meson-1.4.1 branch July 10, 2024 20:09
@alyssais alyssais added the backport staging-24.05 Backport PR automatically label Jul 10, 2024
Copy link
Contributor

Backport failed for staging-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.05
git worktree add -d .worktree/backport-316178-to-staging-24.05 origin/staging-24.05
cd .worktree/backport-316178-to-staging-24.05
git switch --create backport-316178-to-staging-24.05
git cherry-pick -x 9d76da314b9262ae22086f859f4a815e7b33a54d

@alyssais
Copy link
Member Author

alyssais commented Jul 10, 2024

Backport: #326178

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants