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

Support the latest newlib, libc++ and GCC (replaces #442) #470

Merged
merged 5 commits into from
Nov 12, 2024
Merged

Conversation

ppannuto
Copy link
Member

@ppannuto ppannuto commented Oct 23, 2024

#442 has an unfortunate chicken-and-egg problem wherein a commit new enough to checkout by hash in the dockerfile will only exist in the main libtock-c repo if the pull request comes from a branch within the libtock-c repo.

Hence this PR, which is based on the external branch, but is now coming from an internal branch. This isn't the most ergonomic or friendly solution, but this is also a rare enough issue [hopefully] that a little occasional human labor seems the path of least resistance.

I added commits to update the repo path, remove the unneeded patch file, and update the hash to check out.


TODO: Technically, the Makefile change to only patch if there's a patchfile is untested as newlib is still building on my laptop, but I doubt there will be any issue Hubris will get you every time... ceda51b

alevy
alevy previously approved these changes Oct 25, 2024
@alevy
Copy link
Member

alevy commented Oct 25, 2024

@ppannuto (and @bradjc & @lschuermann) does this require updating our binary repositories of pre-compiled libraries?

@lschuermann
Copy link
Member

@alevy Yes, I guess so. @bradjc I have never built these toolchains, do you have this infrastructure already set up? We can then add these new artifacts to the mirrorcheck DB which will ensure that we have this replicated everywhere.

@ppannuto
Copy link
Member Author

@lschuermann re build infra: that's what the dockerization is for; it should just be a matter of running each of the new docker-create.sh's.

That said, I'm building the toolchains currently and can send you built artifacts for the mirror when they finish.

@ppannuto
Copy link
Member Author

@bradjc @lschuermann Here are updated built artifacts for mirrors:

https://www.dropbox.com/scl/fi/26qy6b90048splzzyd42z/libtock-newlib-4.4.0.20231231.zip?rlkey=3wyfyokyoj3i5ukcb9vrotvf5&dl=0
686af44e1bba625eb24b3cfb1fd2d48a61848c1edebbd49b5dbec554ebf2ea94 libtock-newlib-4.4.0.20231231.zip

https://www.dropbox.com/scl/fi/ns3ylwnoywgecgjz3vdjy/libtock-libc-14.1.0.zip?rlkey=x79iryk0yq2eme6f381sw4d2p&dl=0
46d50ea6a380f2c977e6aad187da216c35b793b31b3ea6de9646339c2a22f13c libtock-libc++-14.1.0.zip

I think this PR should be good to go

alevy
alevy previously approved these changes Oct 28, 2024
bradjc
bradjc previously requested changes Oct 29, 2024
Copy link
Contributor

@bradjc bradjc left a comment

Choose a reason for hiding this comment

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

Assuming it is supposed to be libtock-libc++-14.1.0.zip I have added these to the uva mirror.

libc++/Makefile Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Why these changes?

lschuermann added a commit to tock/mirrorcheck that referenced this pull request Nov 1, 2024
@lschuermann
Copy link
Member

Here are updated built artifacts for mirrors:

@ppannuto Sorry for the delay, added them to my mirror and the mirrorcheck URLs: tock/mirrorcheck@8cdd72e

@bradjc
Copy link
Contributor

bradjc commented Nov 1, 2024

I guess we can vote, but I feel that these are not commands to build our project but are frozen steps to reproduce a dependency. The changes are also not related to the PR title.

lschuermann
lschuermann previously approved these changes Nov 1, 2024
Copy link
Member

@lschuermann lschuermann left a comment

Choose a reason for hiding this comment

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

I'm indifferent w.r.t. the @ changes. I agree they maybe shouldn't be part of this PR, but they are in a separate commit, and I don't have strong feelings about the actual changes either way.

Rest looks good.

@alevy
Copy link
Member

alevy commented Nov 2, 2024

I'm similarly agnostic regarding the @, though am sympathetic to @bradjc's kvetching over mixing this into a basically unrelated PR. I won't block either way, but I suggest @ppannuto just remove that commit (and maybe make it VERBOSE=1 option in a different PR?) in the name of peaceable coexistance and harmony

@ppannuto ppannuto dismissed stale reviews from lschuermann and alevy via a03e402 November 4, 2024 18:09
@ppannuto
Copy link
Member Author

ppannuto commented Nov 4, 2024

Updated. Now with 100% fewer controversial @ changes.

lschuermann
lschuermann previously approved these changes Nov 4, 2024
alevy
alevy previously approved these changes Nov 6, 2024
@alevy alevy enabled auto-merge November 6, 2024 20:14
@ppannuto
Copy link
Member Author

ppannuto commented Nov 6, 2024

@alevy Why did this need a rebase? It should have merged cleanly, no?

The last commit ( 54b93c4 ) needs to update to point to 2e6baf2 now...

@ppannuto ppannuto disabled auto-merge November 6, 2024 21:23
@alevy
Copy link
Member

alevy commented Nov 6, 2024

@alevy Why did this need a rebase? It should have merged cleanly, no?

Idk, but it wouldn't have merged cleanly, GitHub wouldn't let me hit the merge button.

@alevy
Copy link
Member

alevy commented Nov 6, 2024

@bradjc I think your comments have been addressed. Re-review (or just dismiss your old review)?

@ppannuto
Copy link
Member Author

ppannuto commented Nov 6, 2024

image I do think the new github UX is confusing, but I think the "out of date" is just a warning that clicking Merge will create a merge commit [while rebase would allow just fast forward]. I don't think you _have_ to rebase—at least I didn't have to last week when I merged one that looked similar.

@alevy
Copy link
Member

alevy commented Nov 7, 2024

Ahhh.... ok

@ppannuto ppannuto dismissed stale reviews from alevy and lschuermann via a03e402 November 8, 2024 23:14
@ppannuto
Copy link
Member Author

ppannuto commented Nov 8, 2024

Undid the rebase with force push from my laptop still at old head. Should be good to go.

@alevy
Copy link
Member

alevy commented Nov 9, 2024

@bradjc ?

@lschuermann
Copy link
Member

Let's give this one more day for last-call.

@alevy alevy dismissed bradjc’s stale review November 12, 2024 00:17

Addressed concerns.

@alevy alevy added this pull request to the merge queue Nov 12, 2024
Merged via the queue into master with commit 4fbc2a0 Nov 12, 2024
8 checks passed
@alevy alevy deleted the gcc-lib-bump branch November 12, 2024 00:26
@alistair23
Copy link
Contributor

This seems to break builds

Fetching newlib from https://www.cs.virginia.edu/~bjc8c/archive/tock...
  Fetching https://www.cs.virginia.edu/~bjc8c/archive/tock/libtock-newlib-4.4.0.20231231.zip...
--2024-11-12 12:58:09--  https://www.cs.virginia.edu/~bjc8c/archive/tock/libtock-newlib-4.4.0.20231231.zip
Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
Resolving www.cs.virginia.edu (www.cs.virginia.edu)... 128.143.67.8
Connecting to www.cs.virginia.edu (www.cs.virginia.edu)|128.143.67.8|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 355123001 (339M) [application/zip]
Saving to: 'libtock-newlib-4.4.0.20231231.zip'

libtock-newlib-4.4.0.20231231.zip      100%[============================================================================>] 338.67M  11.6MB/s    in 35s     

2024-11-12 12:58:45 (9.68 MB/s) - 'libtock-newlib-4.4.0.20231231.zip' saved [355123001/355123001]

sha256sum: 'standard input': no properly formatted checksum lines found
  WARNING: Fetching newlib from mirror https://www.cs.virginia.edu/~bjc8c/archive/tock failed!

ppannuto added a commit that referenced this pull request Nov 13, 2024
This should have been part of #470.
@ppannuto
Copy link
Member Author

#476

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.

5 participants