Bug 275675 - devel/root: Update to 6.30/02
Summary: devel/root: Update to 6.30/02
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Nuno Teixeira
URL: https://root.cern/doc/v630/release-no...
Keywords:
Depends on:
Blocks:
 
Reported: 2023-12-10 14:20 UTC by Erik Jensen
Modified: 2023-12-27 21:14 UTC (History)
2 users (show)

See Also:


Attachments
Patch for upgrade of devel/root (679.62 KB, patch)
2023-12-10 14:20 UTC, Erik Jensen
erik: maintainer-approval+
Details | Diff
Improved patch for update of devel/root (281.56 KB, patch)
2023-12-13 23:03 UTC, Erik Jensen
erik: maintainer-approval+
Details | Diff
13.2 aarch64 plist issues (287.73 KB, application/x-xz)
2023-12-22 09:33 UTC, Nuno Teixeira
no flags Details
Patch for aarch64 pkg-plist (52.52 KB, patch)
2023-12-27 12:44 UTC, Erik Jensen
erik: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Erik Jensen 2023-12-10 14:20:31 UTC
Created attachment 246954 [details]
Patch for upgrade of devel/root

Attached patch for upgrade of port to version 6.30/02

Most of the port's patching of the source code is no longer needed, 
thanks to the amazing work carried out by mkrzewic at github.
His work is now part of the actual source code.

I am aware of the fact that some files are not installed/only installed 
on arm64 (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274696#c2), 
but I have no means, myself, of testing this.
If pkg-plist could be properly populated for architectures different 
from amd64, then ROOT should be able to build and run on those 
architectures as well.
Comment 1 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-12 08:20:51 UTC
Hello,

On next update try to pet Q/A, e.g.:

====> Running Q/A tests (stage-qa)
Warning: you may not need USES=desktop-file-utils
OK, it uses MimeType

Warning: you might not need LIB_DEPENDS on libgsl.so
LIB_DEPENDS:
-libgsl.so:math/gsl
Could be a build depends

Warning: you might not need LIB_DEPENDS on libpng.so
LIB_DEPENDS:
-libpng.so:graphics/png
+libpng16.so:graphics/png

Warning: you might not need LIB_DEPENDS on libunwind.so
Could be build depends

Warning: you might not need LIB_DEPENDS on libxkbcommon.so
Warning: you might not need LIB_DEPENDS on libpango-1.0.so
Try remove those deps
Comment 2 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-12 08:22:00 UTC
I will do a arm64 testport on a rpi4 and I will let you know about results.
Comment 3 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-12 08:38:39 UTC
(In reply to Erik Jensen from comment #0)

pkg-plist needs to be sorted alfabetically:
https://docs.freebsd.org/en/books/porters-handbook/book/#porting-pkg-plist

- %%OPTION%% entries should be ignored and not sorted by it
- other vars should be translated and organized by its real path:
e.g.:
a
b
c
..
r
%%DATADIR%%/data == share/PORTNAME/data
--------------------^

Or just do a makeplist.
Comment 4 Erik Jensen 2023-12-13 23:03:06 UTC
Created attachment 247037 [details]
Improved patch for update of devel/root

Hi Nuno,

I carried out the Q/A petting, ensured that the various USES are
tied to the correct options and did a proper `make makeplist` 
sorting of the package files.

If you could test what is missing in pkg-plist on arm64 that would
be great.

As I recall, devel/root used to be test-built on some of the FBSD
clusters, and I would be notified e.g. about pkg-plist issues.
This ceased to happen at some point.
Do you think it would be possible to re-enable this?

Cheers,
Erik
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-12-15 10:48:33 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d1ea41c7391fdeb31f2d59c5d6fb782a0987fc44

commit d1ea41c7391fdeb31f2d59c5d6fb782a0987fc44
Author:     Erik Jensen <erik@tenku.dk>
AuthorDate: 2023-12-15 10:46:21 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-12-15 10:47:43 +0000

    devel/root: Update to 6.30/02

    ChangeLog:      https://root.cern/doc/v630/release-notes.html#release-6.3002
    PR:             275675

 devel/root/Makefile                                |   27 +-
 devel/root/distinfo                                |    6 +-
 .../files/patch-build_unix_compiledata.sh (gone)   |   11 -
 .../patch-cmake_modules_CheckCompiler.cmake (gone) |   11 -
 .../patch-cmake_modules_SetUpLinux.cmake (gone)    |   31 -
 ...tch-core_dictgen_src_rootcling__impl.cxx (gone) |   11 -
 .../patch-core_metacling_src_TCling.cxx (gone)     |   20 -
 ...h-core_metacling_src_rootclingTCling.cxx (gone) |   14 -
 .../patch-core_unix_src_TUnixSystem.cxx (gone)     |   11 -
 .../files/patch-interpreter_CMakeLists.txt (new)   |   30 +
 ...reter_cling_include_cling_libc.modulemap (gone) |    9 -
 devel/root/files/patch-io_io_src_TFile.cxx (gone)  |   21 -
 devel/root/files/patch-main_CMakeLists.txt (gone)  |   24 -
 .../files/patch-tmva_tmva_CMakeLists.txt (gone)    |   26 -
 devel/root/pkg-plist                               | 2997 ++++++++++----------
 15 files changed, 1537 insertions(+), 1712 deletions(-)
Comment 6 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-15 10:50:49 UTC
(In reply to Erik Jensen from comment #4)

https://pkg-status.freebsd.org/
ampere machines

I will try to know why we can't access logs.
Comment 7 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-15 10:53:36 UTC
(In reply to Erik Jensen from comment #0)

> Most of the port's patching of the source code is no longer needed, 
> thanks to the amazing work carried out by mkrzewic at github.
> His work is now part of the actual source code.

Nice work!

> If you could test what is missing in pkg-plist on arm64 that would
> be great.

Still waiting on rpi4 build results...

Committed, thanks!
Comment 8 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-22 09:33:04 UTC
Created attachment 247194 [details]
13.2 aarch64 plist issues

testport on 13.2 arm64/aarch64 (rpi4) plist issues.

Please take a look.
Re-opening PR.

Cheers
Comment 9 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-22 09:34:41 UTC
Hello Erik,

Finally I got testport completed on arm64.
Please take a look.

(Re-opening PR)

Thanks
Comment 10 Erik Jensen 2023-12-27 12:44:21 UTC
Created attachment 247290 [details]
Patch for aarch64 pkg-plist

Hi Nuno,

I analysed the build log and added entries to pkg-plist where they were needed.
The port should stage successfully now.

There might still be a few missing entries if one enables the non-default 
options MYSQL, PGSQL or SQLITE.

I also noticed an erroneous PLIST_SUB of GTK3_VERSION which is fixed in this 
patch.

Cheers
Comment 11 commit-hook freebsd_committer freebsd_triage 2023-12-27 21:13:15 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e8bbb5bd62be20cf215263ef88dcfd9c31fa29c8

commit e8bbb5bd62be20cf215263ef88dcfd9c31fa29c8
Author:     Erik Jensen <erik@tenku.dk>
AuthorDate: 2023-12-27 21:11:00 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-12-27 21:12:13 +0000

    devel/root: Fix build on aarch64

    PR:             275675

 devel/root/pkg-plist | 584 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 417 insertions(+), 167 deletions(-)
Comment 12 Nuno Teixeira freebsd_committer freebsd_triage 2023-12-27 21:14:53 UTC
plist fixed on aarch64.

Committed, thanks!