PR/253000 Fix bsdrcmds under 13-ALPHA and 14-CURRNT
ClosedPublic
Actions

Authored by cy on Jan 26 2021, 7:15 PM.

Details

Reviewers

Commits

rP564711: Fix build under 13-ALPHA and 14-CURRENT.

Summary

1300134 broke bsdrcmds when support for NO_WERROR=1 was replaced by MK_WERROR=no. This patch fixes the build under 14-CURRENT and 13-ALPHA.

Test Plan

Working locally.

Repository

rP FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

cy created this revision.Jan 26 2021, 7:15 PM

cy requested review of this revision.Jan 26 2021, 7:15 PM

jlh accepted this revision.Jan 30 2021, 9:01 PM

This revision is now accepted and ready to land.Jan 30 2021, 9:01 PM

jlh requested changes to this revision.Jan 30 2021, 9:13 PM

jlh added inline comments.

net/bsdrcmds/Makefile
21	I've just tried on 12-1-RELEASE and MK_WERROR=no seems to works. So I believe you can just swap the old one for the new one.

This revision now requires changes to proceed.Jan 30 2021, 9:13 PM

Simplify patch.

Simpler patch uploaded.

net/bsdrcmds/Makefile
21	NO_WERROR=1 is still needed for 11-STABLE. And src 7fa2f2a62f04f095e1e27ad55aa22a8f59b1df8f was never MFCed back to stable/12 nor to stable/11. Testing replacing NO_WERROR=1 with MK_WERROR=no on ref12-amd64 causes the build to fail. Similarly on ref11-amd64. Based on my tests on ref12-amd64 and ref11-amd64, and based on review of the logs for stable/12 and stable/11, a wholesale replace of NO_WERROR=1 with MK_WERROR=no will cause the build to break on older FreeBSD. I'll upload a simpler patch.