Opened 10 years ago

Closed 10 years ago

Last modified 10 years ago

#45265 closed update (fixed)

ROOT6 : Update to 6.02.00

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

Description

Hi,

Attached patch updates the root6 port to new 6.02/00 release.

  • The source tar ball used is not precisely the released one, but based on a git tag that includes a small fix for the GNU install option which we use, and was broken in the release.
  • The patch file patch-cmake-modules-SearchInstalledSoftware.cmake.diff is no longer needed and can be removed.
  • I also had to add a small work around to the post-destroot phase to remove some build files erroneously installed. Reported upstream and should hopefully be fixed in the next release...
  • added a gcc410 option
  • Tested OK on OSX 10.7 onwards. OSX 10.6 fails to build though (log attached, for those interested). My suspicion is this is due to the newer LLVM version used internally for the Cling interpreter, which no longer supports OSX 10.6, and thus this is an irreducible reduction in support. In which case I would propose just replacing
 if {${os.major} < 10} {
        pre-fetch {
            ui_error "${name} requires C++11 and modifications of the package."
            return -code error "C++11 needed"
        }
    } elseif {${os.major} == 10} {
        # an ugly workaround for lack of __thread on 10.6 (and earlier)
        # it has to be patched properly upstream
        # https://sft.its.cern.ch/jira/browse/ROOT-6394
        patchfiles-append patch-montecarlo-vmc-inc-TMCtls.h.diff
    }

in the port file with

if {${os.major} < 11} {
        pre-fetch {
            ui_error "${name} is not supported on this OSX release."
            return -code error "Unsupported OSX version*
        }
 } 

or word to that effect, unless someone has an idea how to resurrect it on 10.6 ?

Chris

Attachments (8)

OSX106.build.log.bz2 (54.6 KB) - added by cjones051073 (Chris Jones) 10 years ago.
Portfile (25.1 KB) - added by cjones051073 (Chris Jones) 10 years ago.
root.diff (3.7 KB) - added by cjones051073 (Chris Jones) 10 years ago.
patch-montecarlo-vmc-inc-TMCtls.h.diff (553 bytes) - added by cjones051073 (Chris Jones) 10 years ago.
root.2.diff (3.2 KB) - added by cjones051073 (Chris Jones) 10 years ago.
new patch
root.3.diff (3.2 KB) - added by cjones051073 (Chris Jones) 10 years ago.
New patch with gcc410 variant replaced by gcc5
root.4.diff (4.1 KB) - added by cjones051073 (Chris Jones) 10 years ago.
Disable OSX10.6 build
root.5.diff (4.5 KB) - added by cjones051073 (Chris Jones) 10 years ago.
Remove the python 3.1 and 3.2 variants, as per depreciation announcement.

Download all attachments as: .zip

Change History (21)

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: OSX106.build.log.bz2 added

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: Portfile added

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: root.diff added

Changed 10 years ago by cjones051073 (Chris Jones)

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

Upstream have fixed the DESTDIR install issue.

I'll update the patch file accordingly, with the new git tag and without the workaround.

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: root.2.diff added

new patch

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

Can you please ask someone on the mailing list to check and commit this? (Or if someone else notices this.) I'm relatively offline and on a very bad/slow connection.

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

No problem. Are you happy though with the idea of losing support for OSX10.6 ?

comment:4 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)

The patch adds "4.10" to gcc_versions. No such version of gcc exists. It existed briefly, before being replaced by version 5.

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: root.3.diff added

New patch with gcc410 variant replaced by gcc5

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

Thanks, I hadn't noticed that (must have tested gcc410 during the window it was around...). Patch updated.

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: root.4.diff added

Disable OSX10.6 build

Changed 10 years ago by cjones051073 (Chris Jones)

Attachment: root.5.diff added

Remove the python 3.1 and 3.2 variants, as per depreciation announcement.

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

Why do you need patches for patch-montecarlo-vmc-inc-TMCtls.h.diff? Shouldn't that file be simply removed?

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

I had to update the patch file in order to find out it then didn't build, as the old one would not apply at all ... ;)

But yes, if OSX10.6 is no longer supported this file can just be removed completely, I just never bothered to remove the patch details.

Chris

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

I also see that patch-cmake-modules-SearchInstalledSoftware.cmake.diff is not used anywhere. But I don't remember why it's there.

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

In the past I tried to create two versions of ROOT, an old an a new version, one for 10.9 and one for earlier versions. But this will eventually become too painful, I'm afraid, esp. with ROOT6 being quite a moving target.

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

Replying to mojca@…:

I also see that patch-cmake-modules-SearchInstalledSoftware.cmake.diff is not used anywhere. But I don't remember why it's there.

I think you added this patch file ;)

Its for something I believe now fixed upstream, so no longer required.

cheers Chris

comment:11 in reply to:  9 Changed 10 years ago by cjones051073 (Chris Jones)

Replying to mojca@…:

In the past I tried to create two versions of ROOT, an old an a new version, one for 10.9 and one for earlier versions. But this will eventually become too painful, I'm afraid, esp. with ROOT6 being quite a moving target.

I am extremely strongly against this. We either get the latest versions working on OSX 10.6, or declare that platform not supported. Building different versions on different systems is not an option as far as I am concerned.

Note as far as I am aware, upstream only themselves officially support 10.8 onwards.

Chris

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

Resolution: fixed
Status: newclosed
Version: 2.3.1

Ah, OK, I remember now. It was needed in order to be able to disable SDK selection globally (to allow switching to libc++).

I'll test 10.7 when I come home.

Patch committed in r126714. I removed all the patch files.

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

About 10.6: I wouldn't worry about it unless someone actually succeeds to compile the official/nonmodified version of LLVM.

Note: See TracTickets for help on using tickets.