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

rust: update compiler_builtins to 0.1.69 #14011

Merged
merged 1 commit into from Feb 17, 2022

Conversation

evanmiller
Copy link
Contributor

Description

This update is designed to fix the building of librsvg 2.52+ on arm64.

See: rust-lang/compiler-builtins#443
See: rust-lang/compiler-builtins#444

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS x.y
Xcode x.y

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL?
  • checked your Portfile with port lint --nitpick?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?

@macportsbot
Copy link

Notifying maintainers:
@g5pw for port rust.
@herbygillot for port rust.

@g5pw g5pw merged commit f1b402b into macports:master Feb 17, 2022
@g5pw
Copy link
Contributor

g5pw commented Feb 17, 2022

Thanks for your contribution to MacPorts, @evanmiller!

@evanmiller
Copy link
Contributor Author

This broke the build and should probably be reverted until a proper patch is in place:

Executing:  cd "/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/rustc-1.58.1-src" && /usr/bin/make -j8 -w all VERBOSE=1 BOOTSTRAP_ARGS="-vv -j8" 
make: Entering directory `/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/rustc-1.58.1-src'
/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/bin/python3 /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/rustc-1.58.1-src/src/bootstrap/bootstrap.py build --stage 2 -vv -j8
running: /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/rustc-1.58.1-src/build/stage0-x86_64/bin/cargo build --manifest-path /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/rustc-1.58.1-src/src/bootstrap/Cargo.toml --verbose --verbose --offline
error: failed to select a version for the requirement `compiler_builtins = "^0.1.53"`
candidate versions found which didn't match: 0.1.69
location searched: directory source `/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/.home/.cargo/macports` (which is replacing registry `crates-io`)
required by package `std v0.0.0 (/opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_lang_rust/rust/work/rustc-1.58.1-src/library/std)`
perhaps a crate was updated and forgotten to be re-vendored?
As a reminder, you're using offline mode (--offline) which can sometimes cause surprising resolution failures, if this error is too confusing you may wish to retry without the offline flag.

https://build.macports.org/builders/ports-10.15_x86_64-builder/builds/91609/steps/install-port/logs/stdio

@g5pw
Copy link
Contributor

g5pw commented Feb 17, 2022

Uh, sorry, I assumed it was ready to merge. Will revert it later tonight

@evanmiller
Copy link
Contributor Author

OK, I will work on a patch in the meantime, may or may not be easy

@evanmiller
Copy link
Contributor Author

#14034 is building locally; waiting for CI to verify the fix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4 participants