don't set SQLITE3_LIB_DIR in FreeBSD images
#549
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
reitermarkus
previously approved these changes
Aug 29, 2021
|
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>
|
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>
|
Build failed (retrying...): |
bors bot
added a commit
that referenced
this pull request
Aug 29, 2021
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: Daiki Mizukami <tesaguriguma@gmail.com>
|
Build failed:
|
3eb1a9a to
5c1c9de
Compare
|
Rebased onto Still, test on But I don't think it's related to this change. It seems that |
This was referenced Oct 8, 2021
the environment variable has broken procedural macro crates which depends on `libsqlite3-sys`, such as `migrations_macros`. even without the variable, `libsqlite3-sys` finds the correct path anyway. fixes cross-rs#520.
|
Rebased onto master. The MSRV issue seems to have already been fixed by the upstream. |
reitermarkus
approved these changes
Mar 15, 2022
|
bors r+ |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The environment variable has broken procedural macro crates which depend on
libsqlite3-sys, such asmigrations_macros.Even without the variable,
libsqlite3-sysfinds the correct path anyway.This fixes #520, as shown in the CI at tesaguri/cross-freebsd-diesel_migrations-test repository.
Additionally, this PR updatesfreebsd{,-extras}.shto use OpenSSL from the base system, because the URLshttps://pkg.freebsd.org/FreeBSD:12:{amd64,i686}/quarterly/All/openssl-1.1.1j,1.txzreturns404now.