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: add libssp #511

Merged
merged 2 commits into from
Aug 29, 2021
Merged

FreeBSD: add libssp #511

merged 2 commits into from
Aug 29, 2021

Conversation

junhochoi
Copy link
Contributor

This is required to build some native projects
which is build with -fstack-protector when linked.

Also update sqlite3 version (quarterly is updated)

This is required to build some native projects
which is build with -fstack-protector when linked.

Also update sqlite3 version (quarterly is updated)
@junhochoi junhochoi requested review from Dylan-DPC-zz and a team as code owners January 17, 2021 01:26
@svenstaro
Copy link
Contributor

Needs a rebase.

@reitermarkus
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Aug 29, 2021
505: Make the `USER` variable to `docker` optional r=reitermarkus a=eZanmoto

Populating this variable fails under Linux if the local user doesn't have a username. This may happen when using Docker and mapping a user ID from the host into a container, such as when using `--user=$(id -u):$(id -g)`. I suggest making the `USER` environment variable passed to `docker` optional, which allows `cross` to work in the given scenario.

511: FreeBSD: add libssp r=reitermarkus a=junhochoi

This is required to build some native projects
which is build with -fstack-protector when linked.

Also update sqlite3 version (quarterly is updated)

549: don't set `SQLITE3_LIB_DIR` in FreeBSD images r=reitermarkus a=tesaguri

The environment variable has broken procedural macro crates which depend on `libsqlite3-sys`, such as `migrations_macros`.

Even without the variable, `libsqlite3-sys` finds the correct path anyway.

This fixes #520, as shown in the CI at [tesaguri/cross-freebsd-diesel_migrations-test] repository.

Additionally, this PR updates `freebsd{,-extras}.sh` to use OpenSSL from the base system, because the URLs `https://pkg.freebsd.org/FreeBSD:12:{amd64,i686}/quarterly/All/openssl-1.1.1j,1.txz` returns `404` now.

[tesaguri/cross-freebsd-diesel_migrations-test]: https://github.com/tesaguri/cross-freebsd-diesel_migrations-test

Co-authored-by: Sean Kelleher <ezanmoto@gmail.com>
Co-authored-by: Junho Choi <junho.choi@gmail.com>
Co-authored-by: Markus Reiter <me@reitermark.us>
Co-authored-by: Daiki Mizukami <tesaguriguma@gmail.com>
@bors
Copy link
Contributor

bors bot commented Aug 29, 2021

Build failed (retrying...):

bors bot added a commit that referenced this pull request Aug 29, 2021
511: FreeBSD: add libssp r=reitermarkus a=junhochoi

This is required to build some native projects
which is build with -fstack-protector when linked.

Also update sqlite3 version (quarterly is updated)

549: don't set `SQLITE3_LIB_DIR` in FreeBSD images r=reitermarkus a=tesaguri

The environment variable has broken procedural macro crates which depend on `libsqlite3-sys`, such as `migrations_macros`.

Even without the variable, `libsqlite3-sys` finds the correct path anyway.

This fixes #520, as shown in the CI at [tesaguri/cross-freebsd-diesel_migrations-test] repository.

Additionally, this PR updates `freebsd{,-extras}.sh` to use OpenSSL from the base system, because the URLs `https://pkg.freebsd.org/FreeBSD:12:{amd64,i686}/quarterly/All/openssl-1.1.1j,1.txz` returns `404` now.

[tesaguri/cross-freebsd-diesel_migrations-test]: https://github.com/tesaguri/cross-freebsd-diesel_migrations-test

Co-authored-by: Junho Choi <junho.choi@gmail.com>
Co-authored-by: Markus Reiter <me@reitermark.us>
Co-authored-by: Daiki Mizukami <tesaguriguma@gmail.com>
@bors
Copy link
Contributor

bors bot commented Aug 29, 2021

Build failed (retrying...):

@bors
Copy link
Contributor

bors bot commented Aug 29, 2021

Build succeeded:

@bors bors bot merged commit 44f31b8 into cross-rs:master Aug 29, 2021
@Emilgardis Emilgardis added this to the v0.2.2 milestone Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants