Created attachment 241285 [details] Patch to fix building on 123amd64 and restore post-patch step ROOT version 6.28.02 fails to build on 123amd64: https://pkg-status.freebsd.org/beefy6/data/123amd64-default/d55ec1db8ffa/logs/root-6.28.02.log This patch fixes the (sed-related) issue. In addition, I noticed that the post-patch step introduced to the port Makefile in freebsd-ports commit e9e0b380a1ec9ac63ca76da8bc5d9c38e49d38d4 (bug #268701) and slightly modified in commit 7488335156ee822577bbf92ca011d8e9c7af3ad8 (bug #269552) has disappeared from the Makefile without a trace. The deletion of the relevant lines is not logged in any of the commits that follow it - very strange... Has this happened before? I went through the history of the port Makefile and did not find any other parts of the Makefile missing. I submit here - again - the post-patch step, which ensures that ROOT can build on LLVM/Clang 10.0.1 (used on FreeBSD 12.3). Without this step, ROOT would fail to build on 123amd64 due to an error different from the one reported above. Prior to submitting this patch I successfully ran a `poudriere testport` on 123amd64 on my system using this patch.
(In reply to Erik Jensen from comment #0) Hello Erik, That missing part could be deleted by mistake in one of the updates. While I'm still running poudriere tests, 13.2-RC6 (clang 14.0.5) is giving error: --- ===> Checking for items in STAGEDIR missing from pkg-plist ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: lib/root/std_config.pcm --- releases with clang 13: --- .if 1204000 <= ${OSVERSION} && ${OSVERSION} < 1400000 && ${OSVERSION} != 1301507 --- should be changed to: --- .if 1204000 <= ${OSVERSION} && ${OSVERSION} < 1302000 && ${OSVERSION} != 1301507 --- In a few hours I will have testports completed. Cheers
(In reply to Nuno Teixeira from comment #1) Confirmed that it builds on 140, 132-RC6, 131 and 124. Ready for commit
Created attachment 241293 [details] Patch to fix building on 123amd64 and restore post-patch step - refine LLVM/Clang 13 OSVERSION range Hi Nuno, Thanks for taking the time to systematically run all these different test builds. I attach a new patch with your suggested narrowing of OSVERSION ranges. Cheers
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a6c426e3647702ce67a08ce5668e2ad64a36d3d commit 9a6c426e3647702ce67a08ce5668e2ad64a36d3d Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2023-04-04 10:57:58 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2023-04-04 11:06:07 +0000 devel/root: Fix building on 12.3, 13.2 and restore post-patch step ROOT version 6.28.02 fails to build on 123amd64: https://pkg-status.freebsd.org/beefy6/data/123amd64-default/d55ec1db8ffa/logs/root-6.28.02.log This patch fixes the (sed-related) issue. I submit here - again - the post-patch step, which ensures that ROOT can build on LLVM/Clang 10.0.1 (used on FreeBSD 12.3). Fix plist on 13.2 (RC) PR: 270625 devel/root/Makefile | 15 +++++++++++-- .../remove-modules-from-modulemap.awk (new +x) | 9 ++++++++ .../root/scripts/remove-modules-from-modulemap.sh | 26 +++------------------- 3 files changed, 25 insertions(+), 25 deletions(-)
Committed, thanks!
https://cgit.freebsd.org/ports/commit/?id=56932296b7bc5c29380a4c433c5a9250fb6b4fb5 removed workaround for 123 because it's EOLed. This workaround must be removed. Do you have anything to add/change before I commit? Cheers
Well, I guess that explains the sudden disappearance of the post-patch step! Nothing to add, except that the entire scripts directory can then be deleted, as well.
(In reply to Erik Jensen from comment #7) Hello Erik, Preparing for MFH to 2023Q2 (buildfixes). Cheers
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=41a479ef801eb1f07456637e90afdecce951659b commit 41a479ef801eb1f07456637e90afdecce951659b Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2023-04-05 09:59:00 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2023-04-05 11:25:36 +0000 devel/root: Remove 12.3 workaround and clean up Remove build workaround for 12.3 re-added in last commit by mistake that was removed in 5693229 commit. Cleanup port and delete scripts dir used by workaround. PR: 270625 MFH: 2023Q2 (buildfixes) devel/root/Makefile | 13 +------------ devel/root/scripts/remove-modules-from-modulemap.awk (gone) | 9 --------- devel/root/scripts/remove-modules-from-modulemap.sh (gone) | 7 ------- 3 files changed, 1 insertion(+), 28 deletions(-)
Thanks, Nuno!
A commit in branch 2023Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3edaa25693c2c14989097ad21bdc71888b08f78c commit 3edaa25693c2c14989097ad21bdc71888b08f78c Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2023-04-05 09:59:00 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2023-04-05 20:02:43 +0000 devel/root: Remove 12.3 workaround and clean up Remove build workaround for 12.3 re-added in last commit by mistake that was removed in 5693229 commit. Cleanup port and delete scripts dir used by workaround. PR: 270625 MFH: 2023Q2 (buildfixes) (cherry picked from commit 41a479ef801eb1f07456637e90afdecce951659b) devel/root/Makefile | 13 +------------ devel/root/scripts/remove-modules-from-modulemap.awk (gone) | 9 --------- devel/root/scripts/remove-modules-from-modulemap.sh (gone) | 7 ------- 3 files changed, 1 insertion(+), 28 deletions(-)
A commit in branch 2023Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d03aff76e0b0af0e566cd3fce2553449a169704 commit 1d03aff76e0b0af0e566cd3fce2553449a169704 Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2023-04-04 10:57:58 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2023-04-05 20:02:21 +0000 devel/root: Fix building on 12.3, 13.2 and restore post-patch step ROOT version 6.28.02 fails to build on 123amd64: https://pkg-status.freebsd.org/beefy6/data/123amd64-default/d55ec1db8ffa/logs/root-6.28.02.log This patch fixes the (sed-related) issue. I submit here - again - the post-patch step, which ensures that ROOT can build on LLVM/Clang 10.0.1 (used on FreeBSD 12.3). Fix plist on 13.2 (RC) PR: 270625 (cherry picked from commit 9a6c426e3647702ce67a08ce5668e2ad64a36d3d) devel/root/Makefile | 15 +++++++++++-- .../remove-modules-from-modulemap.awk (new +x) | 9 ++++++++ .../root/scripts/remove-modules-from-modulemap.sh | 26 +++------------------- 3 files changed, 25 insertions(+), 25 deletions(-)