Opened 10 years ago

Closed 10 years ago

Last modified 10 years ago

#44296 closed update (fixed)

ROOT5 : Update to 5.34.19

Reported by: cjones051073 (Chris Jones) Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch maintainer Cc: mattiafrancescomoro@…, mojca (Mojca Miklavec)
Port: root5

Description

bump to the latest version...

Attachments (2)

root5.diff (3.9 KB) - added by cjones051073 (Chris Jones) 10 years ago.
Updated patch
root5.34.19-stealthupdate.diff (951 bytes) - added by cjones051073 (Chris Jones) 10 years ago.

Download all attachments as: .zip

Change History (19)

comment:1 Changed 10 years ago by mojca (Mojca Miklavec)

Just a few questions before committing:

  • Did you plan to include some code related to the (conflicting) python variants?
  • We might want to address ticket #44224 (maybe by blacklisting compilers), but I'm not sure how and it's low priority anyway.
  • Somewhere on the "TODO" list I have the following chunk of code left (probably it needs to be tested and compared with ROOT 6):
    +# make sure that the proper variant is automatically selected
    +# (ROOT crashes if the compiler it was built with doesn't exist)
    +if {![variant_isset clang33] && ![variant_isset clang34] && ![variant_isset clang35]} {
    +    if { ${configure.compiler} eq "macports-clang-3.3" } {
    +        default_variants-append +clang33
    +    } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
    +        default_variants-append +clang34
    +    } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
    +        default_variants-append +clang35
    +    }
    +}
    

comment:2 Changed 10 years ago by mojca (Mojca Miklavec)

Version: 2.3.1

comment:3 in reply to:  1 Changed 10 years ago by cjones051073 (Chris Jones)

Replying to mojca@…:

Just a few questions before committing:

  • Did you plan to include some code related to the (conflicting) python variants?

I don't think anything needs updating in the root5 port for this... It should not have the same issues as the root6 port has. ... Or has my memory missed something ?

  • We might want to address ticket #44224 (maybe by blacklisting compilers), but I'm not sure how and it's low priority anyway.

I also do not know how...

  • Somewhere on the "TODO" list I have the following chunk of code left (probably it needs to be tested and compared with ROOT 6):
    +# make sure that the proper variant is automatically selected
    +# (ROOT crashes if the compiler it was built with doesn't exist)
    +if {![variant_isset clang33] && ![variant_isset clang34] && ![variant_isset clang35]} {
    +    if { ${configure.compiler} eq "macports-clang-3.3" } {
    +        default_variants-append +clang33
    +    } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
    +        default_variants-append +clang34
    +    } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
    +        default_variants-append +clang35
    +    }
    +}
    

Yeah, I guess this could be included. I confess I did forget this. Please feel free to add it if you like... Its less important I think as root5 does not use any macports clang compiler by default, due to blacklists etc. So I think in practise hardly any uses will use it, and then probably via the variant anyway.

Chris

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: root5.diff added

Updated patch

comment:4 Changed 10 years ago by cjones051073 (Chris Jones)

Patch file updated. Added the clang stuff + a few new features I noticed from the release notes...

comment:5 Changed 10 years ago by mojca (Mojca Miklavec)

I'm not saying that this is a showstopper, but it's something I expected to fail based on problems in root6:

> port info root5 +python27
Error: Cannot install root5 with +python27 variant
Error: Unable to open port: root6 port is already installed with +python27 and both cannot be active at once. Pick a different python variant.

comment:6 Changed 10 years ago by mojca (Mojca Miklavec)

I think that something like this (inside root5) should work, but I didn't test yet until pre-activate (and it doesn't prevent building root5 +python27 while having root6 +python27 installed):

    require_active_variants root6 "" python${ver_no_dot}

Maybe that's because root6 isn't a dependency of root5? This is certainly something that needs to be fixed though. (Either in my experimental code or in the portgroup.)

comment:7 in reply to:  5 Changed 10 years ago by cjones051073 (Chris Jones)

Replying to mojca@…:

I'm not saying that this is a showstopper, but it's something I expected to fail based on problems in root6:

> port info root5 +python27
Error: Cannot install root5 with +python27 variant
Error: Unable to open port: root6 port is already installed with +python27 and both cannot be active at once. Pick a different python variant.

OK... I didn't think that was something anyone would try... I thought it more likely

 > port info root5
 > port variants root5

which still work...

If you really think it is needed, the same change could be made to the python variants I suppose, to move the check to a later phase...

Chris

comment:8 Changed 10 years ago by mojca (Mojca Miklavec)

Also: I'm not saying that this is something of high importance. I can commit root5 without that change and leave dealing with python variants for later. In particular because we don't know yet how to fix this properly.

comment:9 Changed 10 years ago by cjones051073 (Chris Jones)

Please commit it if you agree. Any changes to the python stuff should probably happen with the root6 port.

comment:10 Changed 10 years ago by mojca (Mojca Miklavec)

Resolution: fixed
Status: newclosed

Committed in r121910 with no changes to python.

comment:11 Changed 10 years ago by cjones051073 (Chris Jones)

It appears upstream have decided to perform a stealth update on the 5.34.19 tarball, as I have just started to see checksum errors on a few machines. No idea why, as I cannot see any obvious reason from the git commits...

anyway, the patch coming next works around this in the usual way ...

Grrr...

Chris

Changed 10 years ago by cjones051073 (Chris Jones)

comment:12 Changed 10 years ago by mojca (Mojca Miklavec)

I knew I shouldn't have updated so fast ;)

comment:13 Changed 10 years ago by mojca (Mojca Miklavec)

I would suggest the following patch instead:

  • Portfile

     
    2424master_sites        http://root.cern.ch/download/ \
    2525                    ftp://root.cern.ch/root/
    2626
    27 checksums           rmd160  8e8a92d8734bd3e30abae66794dac07085e9b7dc \
    28                     sha256  c516d167434c7d6d9c6a2f44f7b4af4115d3d0e3389ba79999ae984aee61356d
     27checksums           rmd160  70dfc1db7198a34edf4a1a06f1750123852093ce \
     28                    sha256  4d83310f2f22fed231220eabfccadcd335f8405d245ba136ea24a267efdcf5c6
    2929
     30dist_subdir         root
    3031worksrcdir          root
    3132
    3233depends_lib         port:xz \

comment:14 Changed 10 years ago by cjones051073 (Chris Jones)

Why ? I just followed the guidelines at

https://trac.macports.org/wiki/PortfileRecipes

I'm fine either way, as long as it works. Just curious as to why the change...

Chris

comment:15 Changed 10 years ago by mojca (Mojca Miklavec)

One reason to do it in a different way than the FAQ suggests is because we used to put all files under

/opt/local/var/macports/distfiles/root/

At some point (probably with version 5.34.38), but I'm not sure when we apparently (accidentally?) switched to

/opt/local/var/macports/distfiles/root5/

I see no reason to continue storing files under root5, we should rather switch back to root. And if we do that, we don't have to worry about stealth updates.

By comparing the two zips it looks as if windows project files had LF line endings. (I didn't inspect closely, that was just my first impression.) This is why we shouldn't need the revbump.

comment:16 in reply to:  15 Changed 10 years ago by cjones051073 (Chris Jones)

Replying to mojca@…:

One reason to do it in a different way than the FAQ suggests is because we used to put all files under

/opt/local/var/macports/distfiles/root/

At some point (probably with version 5.34.38), but I'm not sure when we apparently (accidentally?) switched to

/opt/local/var/macports/distfiles/root5/

I see no reason to continue storing files under root5, we should rather switch back to root. And if we do that, we don't have to worry about stealth updates.

By comparing the two zips it looks as if windows project files had LF line endings. (I didn't inspect closely, that was just my first impression.) This is why we shouldn't need the revbump.

OK by me, makes some sense...

Chris

comment:17 Changed 10 years ago by mojca (Mojca Miklavec)

Committed in r121937.

Note: See TracTickets for help on using tickets.