chronograf: update to 1.11.4 - #62355
Open
eholzbach wants to merge 1 commit into
Open
Conversation
eholzbach
force-pushed
the
chronograf
branch
4 times, most recently
from
September 5, 2026 02:32
a31abc3 to
1314e28
Compare
eholzbach
force-pushed
the
chronograf
branch
2 times, most recently
from
September 5, 2026 02:47
65d597c to
a65272c
Compare
eholzbach
marked this pull request as ready for review
September 5, 2026 02:58
Duncaen
requested changes
Sep 5, 2026
eholzbach
force-pushed
the
chronograf
branch
from
September 6, 2026 20:32
a65272c to
dd19f5c
Compare
eholzbach
force-pushed
the
chronograf
branch
from
September 6, 2026 20:58
dd19f5c to
cd26569
Compare
Duncaen
reviewed
Sep 6, 2026
Comment on lines
+30
to
+33
| if [ "$CROSS_BUILD" ]; then | ||
| # cargo needs the target's prebuilt std lib to cross-compile libflux | ||
| makedepends+=" rust-std" | ||
| fi |
Member
There was a problem hiding this comment.
I wouldn't make this conditional, rust-std would be pulled in for the native architecture during native builds anyways, so adding it non-conditionally to makedepends doesn't actually change what is getting installed for non-cross builds.
Duncaen
reviewed
Sep 6, 2026
|
|
||
| # influxdata/pkg-config picks *-unknown-linux-gnu cargo target on musl builds unless --static | ||
| # https://github.com/influxdata/pkg-config/blob/v0.3.0/libs/flux/build.go#L496 | ||
| vsed -i -e 's/Static: static}, nil/Static: static || os.Getenv("XBPS_TARGET_LIBC") == "musl"}, nil/' vendor/github.com/influxdata/pkg-config/libs/flux/build.go |
Member
There was a problem hiding this comment.
I would just create a patch file to actually patch DetermineCargoTarget instead of setting things static based on libc.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Testing the changes
Local build testing