Skip to content

freebsd add subset of libprocstat#2313

Merged
bors merged 1 commit into
rust-lang:masterfrom
devnexen:fbsd_procstat
Aug 19, 2021
Merged

freebsd add subset of libprocstat#2313
bors merged 1 commit into
rust-lang:masterfrom
devnexen:fbsd_procstat

Conversation

@devnexen

@devnexen devnexen commented Aug 2, 2021

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown

r? @JohnTitor

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

@JohnTitor

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 3, 2021

Copy link
Copy Markdown
Contributor

📌 Commit 735c993 has been approved by JohnTitor

bors added a commit that referenced this pull request Aug 3, 2021
freebsd add subset of libprocstat
@bors

bors commented Aug 3, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit 735c993 with merge 427dc35...

@bors

bors commented Aug 3, 2021

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@bors

bors commented Aug 16, 2021

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #2337) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnTitor

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 19, 2021

Copy link
Copy Markdown
Contributor

📌 Commit be8fc00 has been approved by JohnTitor

@bors

bors commented Aug 19, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit be8fc00 with merge 9247b83...

bors added a commit that referenced this pull request Aug 19, 2021
freebsd add subset of libprocstat
@bors

bors commented Aug 19, 2021

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@JohnTitor

Copy link
Copy Markdown
Member

Seems you messed up a branch by a rebase.

@JohnTitor

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 19, 2021

Copy link
Copy Markdown
Contributor

📌 Commit 250965a has been approved by JohnTitor

@bors

bors commented Aug 19, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit 250965a with merge b82289f...

@bors

bors commented Aug 19, 2021

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing b82289f to master...

@bors bors merged commit b82289f into rust-lang:master Aug 19, 2021
@m-ou-se

m-ou-se commented Sep 3, 2021

Copy link
Copy Markdown
Member

This change broke the freebsd build in the rust-lang/rust CI. See rust-lang/rust#88478 (comment)

/usr/local/x86_64-unknown-freebsd11/bin/ld: cannot find -lprocstat

@lnicola

lnicola commented Sep 3, 2021

Copy link
Copy Markdown
Member

Maybe libprocstat needs to be installed on the system?

@devnexen

devnexen commented Sep 3, 2021

Copy link
Copy Markdown
Contributor Author

normally freebsd comes with since it s a system library not a third party package one and even looking at the git repo in the 11.0 release era it was already that way https://github.com/freebsd/freebsd-src/tree/releng/11.0/lib

@lnicola

lnicola commented Sep 3, 2021

Copy link
Copy Markdown
Member

Well, I ran ./src/ci/docker/run.sh dist-x86_64-freebsd on my branch (oh well, I just wanted a shell, not a dist build) and got the same error:

  = note: /usr/local/x86_64-unknown-freebsd11/bin/ld: cannot find -lprocstat
          clang: error: linker command failed with exit code 1 (use -v to see invocation)

So this is a Docker container, not a real FreeBSD install, right? Then it could be missing some libraries.

@devnexen

devnexen commented Sep 3, 2021

Copy link
Copy Markdown
Contributor Author

It seems ; you did all right in your side.

@m-ou-se

m-ou-se commented Sep 3, 2021

Copy link
Copy Markdown
Member

cc @rust-lang/infra ^

@emilyalbini

Copy link
Copy Markdown
Member

We're cross-compiling FreeBSD from a Linux container, yes. https://github.com/rust-lang/rust/blob/master/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile would need to be updated to make sure the library is present, but I'm not that familiar with FreeBSD cross-compilation so can't give more accurate pointers :(

@devnexen

devnexen commented Sep 5, 2021

Copy link
Copy Markdown
Contributor Author

@emilyalbini

Copy link
Copy Markdown
Member

That's not really feasible with our current CI configuration: we're using cross-compilation for most platforms (everything but Windows and macOS) to standardize our CI as much as possible, and running FreeBSD in a VM would add too much complexity.

I took a quick look at the Docker image, and it seems like the relevant libraries are extracted here, maybe try to include the missing library? https://github.com/rust-lang/rust/blob/e2750baf53aaa60db95f10759f6cf9463dc5a6bd/src/ci/docker/scripts/freebsd-toolchain.sh#L52-L58

@devnexen

devnexen commented Sep 5, 2021

Copy link
Copy Markdown
Contributor Author

ah right in that case it makes sense.

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.

7 participants