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

freebsd: include memstat in build image #1166

Merged
merged 2 commits into from
Dec 4, 2022
Merged

Conversation

taiki-e
Copy link
Contributor

@taiki-e taiki-e commented Dec 4, 2022

libc 0.2.138 added memstat_* functions, but the build with cross fails because the build image does not contain the corresponding library. See rust-lang/libc#3025 for more context. See also rust-lang/rust#105222 which is the same fix to rust-lang/rust's build image.

Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

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

awesome!

Do you think this needs a changelog entry? I'm fine without one

@taiki-e
Copy link
Contributor Author

taiki-e commented Dec 4, 2022

Added a changelog entry for this PR.

Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

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

bors r+

thanks!

@bors
Copy link
Contributor

bors bot commented Dec 4, 2022

Build succeeded:

@bors bors bot merged commit 80a49b3 into cross-rs:main Dec 4, 2022
@taiki-e taiki-e deleted the freebsd-memstat branch December 4, 2022 09:05
@Alexhuszagh Alexhuszagh added container-images A-bsd Area: BSD-family targets labels Dec 4, 2022
sunshowers added a commit to nextest-rs/nextest that referenced this pull request Dec 11, 2022
@Emilgardis Emilgardis added this to the v0.3.0 milestone Dec 29, 2022
svenstaro added a commit to svenstaro/miniserve that referenced this pull request Jan 1, 2023
svenstaro added a commit to svenstaro/genact that referenced this pull request Jan 2, 2023
svenstaro added a commit to svenstaro/site24x7_exporter that referenced this pull request Jan 6, 2023
@Emilgardis Emilgardis modified the milestones: v0.3.0, v0.2.5 Feb 4, 2023
@Emilgardis Emilgardis mentioned this pull request Feb 4, 2023
bors bot added a commit that referenced this pull request Feb 4, 2023
1201: Release v0.2.5 r=Emilgardis a=Emilgardis

See #962 (comment)

includes

ee3c972 #962
fc3df66 #1166
33ee940 in #997
81c1e59 #950
6a57d01 #1183

Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
Co-authored-by: Taiki Endo <te316e89@gmail.com>
bors bot added a commit that referenced this pull request Feb 4, 2023
1201: Release v0.2.5 r=Emilgardis a=Emilgardis

See #962 (comment)

includes

ee3c972 #962
fc3df66 #1166
33ee940 in #997
81c1e59 #950
6a57d01 #1183

Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
Co-authored-by: Taiki Endo <te316e89@gmail.com>
maltekrupa added a commit to maltekrupa/explorer that referenced this pull request Jun 15, 2023
The default is cross 0.2.4 which was created in Juli of 2022 [0]. The
patch to add libmemstat [1] was created in December of 2022, so we need
a newer version of cross.

[0] https://github.com/cross-rs/cross/pkgs/container/x86_64-unknown-freebsd/28076628?tag=0.2.4
[1] cross-rs/cross#1166
maltekrupa added a commit to maltekrupa/explorer that referenced this pull request Jun 15, 2023
The default is cross v0.2.4 which was created in Juli of 2022 [0]. The
patch to add libmemstat [1] was created in December of 2022, so we need
a newer version of cross.

[0] https://github.com/cross-rs/cross/pkgs/container/x86_64-unknown-freebsd/28076628?tag=0.2.4
[1] cross-rs/cross#1166
philss pushed a commit to elixir-explorer/explorer that referenced this pull request Jun 19, 2023
* Add freebsd as target for precomp NIFs

* Use existing target

* Use ubuntu as OS and make use of cross

* Set cross version to v0.2.5

The default is cross v0.2.4 which was created in Juli of 2022 [0]. The
patch to add libmemstat [1] was created in December of 2022, so we need
a newer version of cross.

[0] https://github.com/cross-rs/cross/pkgs/container/x86_64-unknown-freebsd/28076628?tag=0.2.4
[1] cross-rs/cross#1166

* Use ubuntu-22.04 for freebsd target

* Re-enable all disabled targets

* Use ubuntu-22.04 for all cross based targets

* Revert to use ubuntu-20.04 for existing targets

This introduces a new variable `cross-version` which defaults to v0.2.4
and is set to v0.2.5 for freebsd.

It is required because cross v0.2.5 fails to build on ubuntu-20.04.

* Add freebsd to list of targets
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-bsd Area: BSD-family targets container-images
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants