Created attachment 251216 [details] Patch for upgrade of port to version 6.32/00 Attached: Patch for upgrade of port to version 6.32/00 Release notes: https://root.cern/doc/v632/release-notes.html Port config: Added almost all default upstream build options as `make config` options in port framework. There are no actual changes as to what is built by default, but the same configurability, provided by the source code, prior to building is now part of the port Makefile. See https://root.cern/install/build_from_source/#all-build-options Port defaults which differ from the upstream defaults: MYSQL, PGSQL and SQLITE options are OFF. MATHMORE option is ON. CLAD and DAVIX options are OFF. SQL-related options require the relevant frameworks to be installed on the user's system; I do not wish to force any or all of these on a given user who is installing ROOT via `pkg install root`. MATHMORE is, in my experience, almost always necessary, but, for some reason, it is not a default build option upstream. Support for CLAD and DAVIX requires some tinkering with the CMake configuration files in order to avoid the need to download these external components during the configure stage -- this is on my to-do list.
Hello! Build results: * 15amd64 (main-n270502-d1bd097d52cb): OK * 141{amd64,i386}: ==> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: lib/root/std_config.pcm Should condition be adjusted to exclude 14.1 release? --- # std_config.pcm exclusive to FreeBSD 14 .if ${OPSYS} == FreeBSD && (1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000) PLIST_SUB+= ONLY_INSTALLED_ON_FBSD14="" .else PLIST_SUB+= ONLY_INSTALLED_ON_FBSD14="@comment " .endif --- Maybe using vars like 140 and 141? * 140amd64: OK * 133amd64: OK ============ portlint compalins about using symbolic links in $PATCHDIR: (ls -l) interpreter-cling-include-cling-std__fbsd14.1.modulemap -> interpreter-cling-include-cling-std__fbsd15.0.modulemap I will think in something to replace it. But it is not a big issue. Thanks
Created attachment 251246 [details] Patch for upgrade of port to version 6.32/00, revision 1 Hello! I thought the symlink was an "elegant enough" solution, but if portlint (did not notice the complaint on my end, sorry) does not like it... I have added a variable eq_OSREL to the Makefile, instead, and am setting that to "15.0" when OSREL == "14.1". For documentation, the file ${PATCHDIR}/interpreter-cling-include-cling-std__fbsd14.1.modulemap still exists (as a regular file) with contents "interpreter-cling-include-cling-std__fbsd15.0.modulemap". Also, pkg-plist is now only populated with std_config.pcm on 14.0. Cheers
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bd1179bfd1c53363ff11687e9534ad314c61cdf commit 0bd1179bfd1c53363ff11687e9534ad314c61cdf Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2024-06-06 19:33:14 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-06-06 19:33:14 +0000 devel/root: Update to 6.32/00 ChangeLog: https://root.cern/doc/v632/release-notes.html PR: 279520 devel/root/Makefile | 194 +- devel/root/distinfo | 6 +- ...cling_lib_Interpreter_Interpreter.cpp.15aarch64 | 13 +- ...ing-include-cling-std__fbsd14.1.modulemap (new) | 1 + ...ter-cling-include-cling-std__fbsd15.0.modulemap | 7 + .../patch-core_clingutils_src_TClingUtils.cxx | 4 +- .../files/patch-interpreter_CMakeLists.txt (gone) | 30 - ...interpreter_cling_lib_Interpreter_CIFactory.cpp | 4 +- ...terpreter_cling_lib_Interpreter_Interpreter.cpp | 4 +- ...ct_clang_lib_Serialization_ASTWriter.cpp (gone) | 20 - devel/root/pkg-plist | 6172 ++++++++++---------- 11 files changed, 3237 insertions(+), 3218 deletions(-)
Hello! Finally I have results for arm64 and builds are fine on 15(main), 141, 140 and 133. plist problems in tested versions: 15(main): http://freebsdrpi4.hopto.org/data/15aarch64-main/2024-06-07_12h34m10s/logs/errors/root-6.32.00_1.log 141: http://freebsdrpi4.hopto.org/data/141aarch64-main/2024-06-07_21h14m47s/logs/errors/root-6.32.00_1.log 140: http://freebsdrpi4.hopto.org/data/140aarch64-main/2024-06-08_16h28m00s/logs/errors/root-6.32.00_1.log 133: http://freebsdrpi4.hopto.org/data/133aarch64-main/2024-06-09_13h01m19s/logs/errors/root-6.32.00_1.log Thanks
Created attachment 251538 [details] Patch for upgrade of port to version 6.32/00, revision 2 Hello, I have accommodated the plist issues in the attached patch. The plist issues are actually nice to see because the fix is to entirely remove some of the arch-dependent plist substitutions - finally! Note that the attached patch is a diff with respect to the latest port on the main branch (port revision 0), while the attached patch claims to be port revision 2. Cheers
(In reply to Erik Jensen from comment #5) Hello Erik! That's nice that plist mechanics are being improved. While I'm building big deps on aarch64, I did a quick build test on amd64 and all versions that I've tested shows same error: amd64: 15 (main), 141, 140 and 133: ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_bf%%ROOT_CLANG_VER%%.h Error: Missing: %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_cde.h Error: Missing: %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_fp%%ROOT_CLANG_VER%%.h Error: Missing: %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_mve.h Error: Missing: %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_neon.h Error: Missing: %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_sve.h As always I don't like to interfere doing fixes as you know way better this program, its mechanics and port evolution related to fixes and improvements. Related to PORTREVISIONs, since we are doing changes that needs to be tested on a slow machine, we could use PORTREVISION= 101, 102, 103, ..., so we can check better the logs and read better the results. When the time of commit comes, I will change port revision accordingly. Cheers
Created attachment 251563 [details] Patch for upgrade of port to version 6.32/00, revision 3 My bad on those new issues on amd64. They should be fixed in the attached patch. I will start employing port revisions in the 100s from the next release onwards, as you suggest. Cheers!
Created attachment 251564 [details] Patch for upgrade of port to version 6.32/00, revision 3 Forgot to bump the port revision... Try with this one
Added merge-quarterly? flag so the quarterly branches of the upstream build farms can finally get some rest from this port.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=62904d359c5a4a52417dd31369b36fc9643fc0e5 commit 62904d359c5a4a52417dd31369b36fc9643fc0e5 Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2024-06-22 16:05:14 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-06-22 16:05:14 +0000 devel/root: Fix build on aarch64 PR: 279520 MFH: 2024Q2 devel/root/Makefile | 10 +- devel/root/pkg-plist | 437 ++++++++++++--------------------------------------- 2 files changed, 102 insertions(+), 345 deletions(-)
A commit in branch 2024Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b24bd8fc2b80f742bd13caadc2494a9a80876072 commit b24bd8fc2b80f742bd13caadc2494a9a80876072 Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2024-06-22 16:05:14 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-06-22 17:52:50 +0000 devel/root: Fix build on aarch64 PR: 279520 MFH: 2024Q2 (cherry picked from commit 62904d359c5a4a52417dd31369b36fc9643fc0e5) devel/root/Makefile | 10 +- devel/root/pkg-plist | 437 ++++++++++++--------------------------------------- 2 files changed, 102 insertions(+), 345 deletions(-)
A commit in branch 2024Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f7f5435017524b85ea094a55f2f84fda75e9294 commit 1f7f5435017524b85ea094a55f2f84fda75e9294 Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2024-06-06 19:33:14 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-06-22 17:52:30 +0000 devel/root: Update to 6.32/00 ChangeLog: https://root.cern/doc/v632/release-notes.html PR: 279520 (cherry picked from commit 0bd1179bfd1c53363ff11687e9534ad314c61cdf) devel/root/Makefile | 194 +- devel/root/distinfo | 6 +- ...cling_lib_Interpreter_Interpreter.cpp.15aarch64 | 13 +- ...ing-include-cling-std__fbsd14.1.modulemap (new) | 1 + ...ter-cling-include-cling-std__fbsd15.0.modulemap | 7 + .../patch-core_clingutils_src_TClingUtils.cxx | 4 +- .../files/patch-interpreter_CMakeLists.txt (gone) | 30 - ...interpreter_cling_lib_Interpreter_CIFactory.cpp | 4 +- ...terpreter_cling_lib_Interpreter_Interpreter.cpp | 4 +- ...ct_clang_lib_Serialization_ASTWriter.cpp (gone) | 20 - devel/root/pkg-plist | 6172 ++++++++++---------- 11 files changed, 3237 insertions(+), 3218 deletions(-)
Committed! Thanks for your good work.