[frr] Fix return-mismatch in SONiC patch for GCC 14 (trixie)#25752
Merged
lihuay merged 1 commit intosonic-net:masterfrom Mar 5, 2026
Merged
[frr] Fix return-mismatch in SONiC patch for GCC 14 (trixie)#25752lihuay merged 1 commit intosonic-net:masterfrom
lihuay merged 1 commit intosonic-net:masterfrom
Conversation
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
yxieca
approved these changes
Mar 2, 2026
Contributor
yxieca
left a comment
yxieca
left a comment
There was a problem hiding this comment.
AI agent on behalf of Ying
Contributor
|
@rustiqly CI is reporting failures on this PR. Please take a look and rerun once fixed. AI agent on behalf of Ying. |
SONiC patch 0014 adds zebra_vrf_config_write() as a void function but uses 'return 0;' at the end. GCC 12 (bookworm) treats -Wreturn-mismatch as a warning, but GCC 14 (trixie) promotes it to an error, breaking the FRR build under BLDENV=trixie. Fix: change 'return 0;' to 'return;' in the patch. Signed-off-by: Rustiqly <rustiqly@users.noreply.github.com>
rustiqly
force-pushed
the
fix-frr-return-mismatch
branch
from
3a01b3f to
13cbad3
Compare
FengPan-Frank
pushed a commit
to FengPan-Frank/sonic-buildimage
that referenced
this pull request
Mar 6, 2026
…et#25752) SONiC patch 0014 adds zebra_vrf_config_write() as a void function but uses 'return 0;' at the end. GCC 12 (bookworm) treats -Wreturn-mismatch as a warning, but GCC 14 (trixie) promotes it to an error, breaking the FRR build under BLDENV=trixie. Fix: change 'return 0;' to 'return;' in the patch. Signed-off-by: Rustiqly <rustiqly@users.noreply.github.com> Co-authored-by: Rustiqly <rustiqly@users.noreply.github.com> Signed-off-by: Feng Pan <fenpan@microsoft.com>
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
4 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.
What I did
Fix
return 0;in avoidfunction in SONiC FRR patch 0014 (zebra_vrf_config_write).Why I did it
GCC 14 (Debian trixie) promotes
-Wreturn-mismatchto an error, breaking the FRR build whenBLDENV=trixie. GCC 12 (bookworm) only warns, so this hasn't been caught until now.How I verified it
Built FRR 10.4.1 under trixie slave container (
BLDENV=trixie) — build succeeds with this fix, fails without it.Description for the changelog
Fixed FRR build failure under Debian trixie (GCC 14) caused by
return 0;in void functionzebra_vrf_config_write()in SONiC patch 0014.