mrustc: update to 20220125 #13817

catap · 2022-01-29T23:03:56Z

Description

It also:

blacklisted unsupported compillers;
added full rust and cargo bootsrap;
fixed build on macOS 10.6;
claim myself as maintainer.

Yeah, it brings rust to macOS 10.6.

This rust is installed under /opt/local/libexec/mrustc-1.39.

See: https://trac.macports.org/ticket/64146

Type(s)

bugfix
enhancement
security fix

Tested on

macOS 10.6.8 10K549 x86_64
Xcode 3.2.6 10M2518

macOS 12.1 21C52 x86_64
Xcode 13.2.1 13C100

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?

catap · 2022-01-29T23:04:42Z

And I'd love to share the picture:

Cc: @evanmiller @kencu

catap · 2022-01-29T23:14:55Z

@g5pw / @herbygillot the next step will be integrate it into existed rust port. Because it requires some patches to rust and rust's llvm.... well.. I suggest to install mrustc as dependency and add a few symlinks for cargo and rust port :)

Do you have anything in mind?

kencu · 2022-01-29T23:21:22Z

Great work - lots of nice effort here. Will be important if MacPorts is to not soon lose 10.6 support soon, for sure.

BTW, I found something interesting here for you, on a separate but somewhat related topic. One of the fellows who is around MacPorts sometimes has written up a very detailed, exactly what happens when and in what code, description of how the darwin 10.7+ thread_local_storage program is implemented. Some details here I had not seen summarized before:

iains/gcc-darwin-arm64#1 (comment)

kencu · 2022-01-29T23:41:57Z

Now that you have a rust that works on 10.6, perhaps that could be used to step-by-step move towards a current rustc manually, at least. Then that could be used either directly, or as a bootstrap for rust instead of the one usually pulled by rustup.

I have done something very similar for ghc, and I use this to build all the current ports in macports that use ghc (shellcheck, pandoc, etc) on 10.6.8, and as a bootstrap compiler for newer ghc versions (every once in a while, I update them to the current releases):

https://github.com/kencu/ghc-for-older-darwin-systems/releases

catap · 2022-01-29T23:44:10Z

@kencu it uses mrustc as the way to compile it and upstream is working to support 1.54.

To be honest it still needs some patches to LLVM and rust to make it works, but this port includes full bootstrapped rust :)

kencu · 2022-01-30T00:11:46Z

yep, I get it. But now that you have a working rustc, you could forget all about mrustc now, and use your working rust 1.39 to step up to the current rust, in a few steps, with whatever rust patches are needed of curse.

This is exactly what I did with ghc.

catap · 2022-01-30T00:14:39Z

@kencu I'm too lazy to do it to be honest. To build rust 1.58 I must use rust 1.57+; it is 1.39 that means that I need to iterate the loop for 19 times.

This also includes to update patches to LLVM and rust. I do have everything ready for 1.54. Or at least as far as I can test.

kencu · 2022-01-30T00:18:46Z

if mrustc is likely to get you to 1.54, sure, faster then.

I haven’t looked at what the reach is for rust… for ghc it’s 2 jumps.

catap · 2022-01-30T00:20:01Z

@kencu a few jumps is simpler :) but rust supports quite strange policy and can't be build but rust compiler that is more than a moth old.

kencu · 2022-01-30T00:26:11Z

I see you’re right about that… they can only build with the one before… yeah, that is a lot of steps.

https://news.ycombinator.com/item?id=18686720

catap · 2022-01-30T00:28:48Z

@kencu the issue that I need bootstrap not only rust, but also cargo... seems like insanity, isn't it?

evanmiller

Very cool! Just a few minor comments from me

evanmiller · 2022-01-30T02:00:19Z

lang/mrustc/Portfile


-version         20220111
+version         20220115


Doesn't really matter but the title says 20220125 (which I think is the correct value)

lang/mrustc/Portfile

evanmiller · 2022-01-30T02:01:28Z

lang/mrustc/Portfile

@@ -59,46 +62,120 @@ compiler.blacklist *gcc*
 #   depends_run-append port:[string map {"macports-gcc-" "gcc"} ${configure.compiler}]
 #}

-# https://github.com/thepowersgang/mrustc/pull/192
-patchfiles-append patch-mrustc-macos-bootstrap.diff
+# Patches avaialble as git branch: https://github.com/catap/mrustc/tree/macports


avaialble => available

evanmiller · 2022-01-30T02:02:28Z

lang/mrustc/Portfile

+    set pythonfullpath   /usr/bin/python2.7
+} else {
+    set pythonfullpath   ${prefix}/bin/python2.7
+    depends_lib-append   port:python27


Should this be depends_run? (depends_run is used if there is no library linkage.)

In llvm/clang, it is listed as depends_lib, because you need it for both build and run (depends_build + depends_run = depends_lib). Here you only need it for the build I believe, and not at runtime, so it could be depends_build.

~~@evanmiller nope, the only reason to use python2.7 is make clang's cmake happy. After it is built, python2.7 is useless.~~

After a coffee I realized that you both mean. Thanks!

evanmiller · 2022-01-30T02:06:26Z

lang/mrustc/Portfile

+    foreach f {rustc cargo} {
+        xinstall -m 0755 -W ${worksrcpath}/output-${rust_version} $f \
+            ${destroot}${prefix}/libexec/mrustc-${rust_version_major}/bin
+        system -W ${destroot}${prefix}/bin/ "ln -s ../libexec/mrustc-${rust_version_major}/bin/$f ./mrustc-${f}"


Can't wait to build some things with it :-)

evanmiller · 2022-01-30T02:08:35Z

lang/mrustc/Portfile

 }

 # Run a Hello, world! test
-test.env            RUSTC_VERSION=${rust_version} MRUSTC_LIBDIR=output-${rust_version}


MRUSTC_LIBDIR was intentional because it needs to know where the built libraries are before they are installed. (Otherwise the test phase will look for libraries in ${prefix}.)

lang/mrustc/files/0009-macOS-10.6-1.39.0-fix-build-issues-pre-Lion.patch

Gcenx · 2022-01-30T17:11:13Z

I’ll be keeping an eye on your mrustc fork as mrustc seems to be the only sane way to bootstrap for i686-apple-darwin

evanmiller · 2022-01-30T20:48:44Z

I am seeing some build failures locally (10.6.8) that look like upstream bugs – something about non-UTF-8 C sources and then an unrecognized symbol in the generated C code. I will try again with your latest patches and report back.

kencu · 2022-02-09T19:47:21Z

If you can now go clang -> mrustc -> rustc 1.54 then that is a real leap forward!

Thanks, will try.

catap · 2022-02-09T19:48:25Z

@kencu I'll ping you when it's done. Right now I'm polishing it :)

catap · 2022-02-09T19:56:03Z

~~@kencu anyway, I have strange question. Right now CI fails because of wrong checksum and the issue that port fetches both distfiles from github.~~

~~Do you know any nice way to overstep this issue?~~

Figured it out.

catap · 2022-02-10T15:10:50Z

@kencu, @evanmiller, @Gcenx it's ready for review.

Feel free to install mrustc-rust and enjoy usual rust and cargo in /op/local/libexec/mrustc-rust. I haven't pushed the next steps because building time of this is incredible (~5 hours) and I hope to have a green mark from CI.

Anyway, if your machine has enough RAM (enough means 8G) feel free to edit this port file and uncomment lines 180-181 what reduce building time significantly.

The root cause of such memory consumption is paralell run of clang which is compiling:

-rw-r--r--  1 macports  wheel   834M Feb 10 15:15 rustc-build/librustc_query_impl.rlib.c
-rw-r--r--  1 macports  wheel   431M Feb 10 16:00 rustc-build/librustc_mir.rlib.c
-rw-r--r--  1 macports  wheel   399M Feb 10 15:04 rustc-build/librustc_middle.rlib.c

P.S. I do have as the next step rust-1.54 without any wrappers and install_name_tool -change hacks, and testing rust-1.55

evanmiller · 2022-02-10T15:20:19Z

Have you tested GCC support since the Core2 patches were merged? Would be nice to support it at least with the base mrustc.

catap · 2022-02-10T15:22:42Z

@evanmiller I've started with building LIBS and it moved forward, but not sure had I allow to finish or interrupt.

Anyway, support of gcc on macOS 10.6 is tricky and I prefer to not waste time on it.

kencu · 2022-02-10T17:07:57Z

Last night I installed these:

  mrustc @20220209_0 (active) requested_variants='' platform='darwin 10' archs='x86_64' date='2022-02-09T21:39:41-0800'
  mrustc-rust @20220209_0 (active) requested_variants='' platform='darwin 10' archs='x86_64' date='2022-02-10T03:04:57-0800'
  rust-legacy-bootstrap @20220209_0 (active) requested_variants='' platform='darwin 10' archs='noarch' date='2022-02-09T21:26:22-0800'

and they seem to provide a working rustc and cargo, versions 1.54.

SnowLeopardServerVM:mrustc $ /opt/local/libexec/mrustc-rust/bin/cargo  -V
cargo 1.54.0
SnowLeopardServerVM:mrustc $ /opt/local/libexec/mrustc-rust/bin/rustc  -V
rustc 1.54.0-stable-mrustc

I'm not sure what you changed after that, but these seem to work.

Now have to figure out how to get MacPorts to accept them as replacements for rust/cargo, until such time as they are used to bootstrap to current rust versions in the real ports.

Looking good.

catap · 2022-02-10T17:33:36Z

@kencu I've updated used version of mrustc which allows to run without any additional patches to it :)

I also fixed a build of cargo which produces unworking cargo if libgit2 was installed.

Regarding integration: my plan is backport my legacy patch to current master and introduce a few rust-... ports. As soon as it merged I start to push them one-by-one.

After that I plan to rename current rust port to rust-upstream which allows to remove near of all hacks that it has :)

And when add a simple wrapper-port rust which installs rust-upstream for modern OS and some legacy port for old one.

To be honest everything is ready and just wait to be delivered opened :)

catap · 2022-02-10T20:54:01Z

Restarted CI because it was too long for 10.15; probably overload machine.

catap · 2022-02-10T23:32:28Z

Wired. One dependencies compiled ~1.5 hours on 10.15:

but on 11 it was something like ten seconds:

evanmiller · 2022-02-11T02:35:34Z

Lint says:

port lint rust-legacy-bootstrap:
Warning: Line 27 should say "use_configure no" instead of declaring an empty configure phase

I think at this point I wouldn't worry about CI and I would just let the build bots tell you about any platform issues.

It also: - switched to rust 1.54.0; - blacklisted unsupported compilers; - added full rust and cargo bootstrap; - fixed build on macOS 10.6; - claim myself as maintainer. See: https://trac.macports.org/ticket/64146

catap · 2022-02-11T10:00:15Z

@kencu may I ask you to move forward with this version and force to bulldbots to test it?

macportsbot added maintainer: none type: enhancement type: update labels Jan 29, 2022

catap force-pushed the mrustc branch from a109149 to 6b8a183 Compare January 29, 2022 23:09

catap force-pushed the mrustc branch from 6b8a183 to e045ecb Compare January 30, 2022 00:20

catap force-pushed the mrustc branch from e045ecb to c56847a Compare January 30, 2022 00:28

catap force-pushed the mrustc branch from c56847a to 1b06712 Compare January 30, 2022 00:39

evanmiller reviewed Jan 30, 2022

View reviewed changes

catap force-pushed the mrustc branch 2 times, most recently from e7cdd3b to 14be6b1 Compare January 30, 2022 12:47

catap requested a review from kencu January 30, 2022 13:24

catap force-pushed the mrustc branch 2 times, most recently from 3d29286 to ed61855 Compare January 30, 2022 16:11

catap force-pushed the mrustc branch 4 times, most recently from 707b926 to 8ce5058 Compare January 30, 2022 20:09

catap force-pushed the mrustc branch 4 times, most recently from 85d05ad to 90e4cac Compare February 9, 2022 19:03

catap force-pushed the mrustc branch 6 times, most recently from 6a3a647 to ad4222e Compare February 10, 2022 15:07

catap marked this pull request as ready for review February 10, 2022 15:07

catap force-pushed the mrustc branch from ad4222e to 7a345be Compare February 10, 2022 20:53

catap added 2 commits February 11, 2022 10:56

rust-legacy-bootstrap: new port

4ac1764

mrustc: update to 20220210

5ea1417

It also: - switched to rust 1.54.0; - blacklisted unsupported compilers; - added full rust and cargo bootstrap; - fixed build on macOS 10.6; - claim myself as maintainer. See: https://trac.macports.org/ticket/64146

catap force-pushed the mrustc branch from 7a345be to b0598f9 Compare February 11, 2022 09:58

catap force-pushed the mrustc branch from b0598f9 to 5ea1417 Compare February 11, 2022 10:25

kencu merged commit 8799784 into macports:master Feb 12, 2022

catap deleted the mrustc branch February 12, 2022 10:03

Uh oh!

mrustc: update to 20220125 #13817

mrustc: update to 20220125 #13817

Uh oh!

Conversation

catap commented Jan 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type(s)

Tested on

Verification

Uh oh!

catap commented Jan 29, 2022

Uh oh!

catap commented Jan 29, 2022

Uh oh!

kencu commented Jan 29, 2022

Uh oh!

kencu commented Jan 29, 2022

Uh oh!

catap commented Jan 29, 2022

Uh oh!

kencu commented Jan 30, 2022

Uh oh!

catap commented Jan 30, 2022

Uh oh!

kencu commented Jan 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

catap commented Jan 30, 2022

Uh oh!

kencu commented Jan 30, 2022

Uh oh!

catap commented Jan 30, 2022

Uh oh!

evanmiller left a comment

Choose a reason for hiding this comment

Uh oh!

evanmiller Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

catap Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

evanmiller Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

evanmiller Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

kencu Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

catap Jan 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

evanmiller Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

evanmiller Jan 30, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Gcenx commented Jan 30, 2022

Uh oh!

evanmiller commented Jan 30, 2022

Uh oh!

kencu commented Feb 9, 2022

Uh oh!

catap commented Feb 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

catap commented Feb 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

catap commented Feb 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

catap commented Jan 29, 2022 •

edited

Loading

kencu commented Jan 30, 2022 •

edited

Loading

catap Jan 30, 2022 •

edited

Loading

catap commented Feb 9, 2022 •

edited

Loading

catap commented Feb 9, 2022 •

edited

Loading

catap commented Feb 10, 2022 •

edited

Loading

catap commented Feb 10, 2022 •

edited

Loading