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.

Sign up for GitHub

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

Jump to bottom

Add gnu_get_[version|release] for glibc #2862

Merged
merged 2 commits into from
Aug 11, 2022
Merged

Add gnu_get_[version|release] for glibc #2862

merged 2 commits into from
Aug 11, 2022

Conversation

LegNeato
Copy link
Contributor

@LegNeato LegNeato commented Aug 4, 2022 •
edited
Loading

@rust-highfive
Copy link

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@Amanieu
Copy link
Member

Amanieu commented Aug 4, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Aug 4, 2022

📌 Commit f415078 has been approved by Amanieu

It is now in the queue for this repository.

bors added a commit that referenced this pull request Aug 4, 2022
@bors
Auto merge of #2862 - LegNeato:master, r=Amanieu
f1d38be 
Add `gnu_get_[version|release]` for glibc

See <https://sourceware.org/git/?p=glibc.git;a=blob;f=csu/version.c;h=8c0ed79c01223e1f12b54d19f90b5e5b7dd78d27;hb=HEAD#l51> and <http://refspecs.linux-foundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libc-gnu-get-libc-version-1.html>
@bors
Copy link
Contributor

bors commented Aug 4, 2022

⌛ Testing commit f415078 with merge f1d38be...

@bors
Copy link
Contributor

bors commented Aug 4, 2022

💔 Test failed - checks-actions

@LegNeato
Copy link
Contributor Author

LegNeato commented Aug 8, 2022

I don't think this failure was caused by my code, any action on me?

Amanieu
Amanieu reviewed Aug 9, 2022
View reviewed changes
libc-test/build.rs Outdated Show resolved Hide resolved
@LegNeato
Copy link
Contributor Author

LegNeato commented Aug 10, 2022 •
edited
Loading

When I had the include path wrong it failed in CI. Once I had the correct include path it succeeded. So something in CI was able to pick it up.

The functions were introduced in version 2.1, which was released in 1999:

https://sourceware.org/git/?p=glibc.git;a=blob;f=csu/Versions;h=8e1b21948e8d7568c3e61caeaeb719cdaf110272;hb=HEAD#l6

I don't see anything to suggest it is optional / can be turned off, though the GNU manual notes:

This function is missing on some platforms: macOS 11.1, FreeBSD 13.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0.

It looks like alpine linux uses uclibc, which does not include the header. Does homu use alpine linux as its docker image base? If so that could account for the discrepancy...CI uses an image with glibc so the header was found and passed, homu uses alpine so it can't find the header and the merge fails?

@Amanieu
Copy link
Member

Amanieu commented Aug 11, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Aug 11, 2022

📌 Commit f49efe4 has been approved by Amanieu

It is now in the queue for this repository.

bors added a commit that referenced this pull request Aug 11, 2022
@bors
Auto merge of #2862 - LegNeato:master, r=Amanieu
aa0f5b5 
Add `gnu_get_[version|release]` for glibc

See <https://sourceware.org/git/?p=glibc.git;a=blob;f=csu/version.c;h=8c0ed79c01223e1f12b54d19f90b5e5b7dd78d27;hb=HEAD#l51> and <http://refspecs.linux-foundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libc-gnu-get-libc-version-1.html>
@bors
Copy link
Contributor

bors commented Aug 11, 2022

⌛ Testing commit f49efe4 with merge aa0f5b5...

@bors
Copy link
Contributor

bors commented Aug 11, 2022

💔 Test failed - checks-actions

@Amanieu
Copy link
Member

Amanieu commented Aug 11, 2022

@bors retry

@bors
Copy link
Contributor

bors commented Aug 11, 2022

⌛ Testing commit f49efe4 with merge f742325...

@bors
Copy link
Contributor

bors commented Aug 11, 2022

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: Amanieu
Pushing f742325 to master...

@bors bors merged commit f742325 into rust-lang:master Aug 11, 2022
@LegNeato LegNeato mentioned this pull request Aug 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Amanieu Amanieu Amanieu left review comments

Assignees

@Amanieu Amanieu

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LegNeato @rust-highfive @Amanieu @bors