Skip to content

Fix FreeBSD #1467

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 7 commits into from
Aug 15, 2019
Merged

Fix FreeBSD #1467

merged 7 commits into from
Aug 15, 2019

Conversation

gnzlbg
Copy link
Contributor

@gnzlbg gnzlbg commented Aug 14, 2019

#1440 broke FreeBSD by changing libc FreeBSD targets to require a cfg(freebsdXX) to be defined, but not updating build.rs to define freebsd11 when LIBC_CI is not available. Since LIBC_CI is always defined on CI, this issue went undetected.

This PR fixes that issue in the build.rs and introduces a build task that tests FreeBSD without LIBC_CI on FreeBSD11, although I'm not sure this would have caught the issue in #1466 .

Closes #1466 .

@rust-highfive
Copy link

@gnzlbg: no appropriate reviewer found, use r? to override

@pietroalbini
Copy link
Member

/AzurePipelines run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@pietroalbini
Copy link
Member

/AzurePipelines run rust-lang.libc

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Aug 14, 2019

@carllerche thank you for reporting this issue. Would you be able to try the libc branch used by this PR and let us know whether the issue is resolved ?

You would need to amend the libc dependency in your Cargo.toml with:

libc = { version = "0.2", git = "https://github.com/gnzlbg/libc/", branch = "fix_freebsd" }

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Aug 14, 2019

/AzurePipelines run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@gnzlbg gnzlbg closed this Aug 14, 2019
@gnzlbg gnzlbg reopened this Aug 14, 2019
@gnzlbg gnzlbg mentioned this pull request Aug 14, 2019
@pizzamig
Copy link
Contributor

Removing the LIBC_CI detection, the freebsd11 is not the default one anymore.
I guess, the LIBC_CI detection should be there, adding a else branch that forcibly define freebsd11

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Aug 14, 2019

I'm not sure what you mean by:

Removing the LIBC_CI detection, the freebsd11 is not the default one anymore.
I guess, the LIBC_CI detection should be there, adding a else branch that forcibly define freebsd11

@pizzamig
Copy link
Contributor

I mean, that I misread the patch, sorry.

The patch is explicitly forcing freebsd11 when no LIBC_CI is defined.
It looks good to me.

@gnzlbg
Copy link
Contributor Author

gnzlbg commented Aug 15, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 15, 2019

📌 Commit f081694 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Aug 15, 2019

⌛ Testing commit f081694 with merge 37f8f8d...

bors added a commit that referenced this pull request Aug 15, 2019
Fix FreeBSD

#1440 broke FreeBSD by changing `libc` FreeBSD targets to require a `cfg(freebsdXX)` to be defined, but not updating `build.rs` to define `freebsd11` when `LIBC_CI` is not available. Since `LIBC_CI` is always defined on CI, this issue went undetected.

This PR fixes that issue in the `build.rs` and introduces a build task that tests FreeBSD without `LIBC_CI` on FreeBSD11, although I'm  not sure this would have caught the issue in #1466 .

Closes #1466 .
@bors
Copy link
Contributor

bors commented Aug 15, 2019

☀️ Test successful - checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, status-azure
Approved by: gnzlbg
Pushing 37f8f8d to master...

@bors bors merged commit f081694 into rust-lang:master Aug 15, 2019
@cuviper cuviper mentioned this pull request Aug 24, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0.2.61 regression
5 participants