Opened 9 years ago

Closed 9 years ago

#46650 closed update (fixed)

Update: octave-tsa 4.2.8

Reported by: Schamschula (Marius Schamschula) Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version: 2.3.3
Keywords: haspatch maintainer Cc: michaelld (Michael Dickens)
Port: octave-tsa

Description

Update octave-tsa to version 4.2.8.

Use octave-1.1 PortGroup https://trac.macports.org/ticket/46649 to properly choose path to libgomp.

Also disable all references to MatLab in Makefile.

Attachments (4)

octave-tsa-libgcc.diff (6.7 KB) - added by michaelld (Michael Dickens) 9 years ago.
Portfile-octave-tsa.diff (1.1 KB) - added by Schamschula (Marius Schamschula) 9 years ago.
patch-src-Makefile.diff (4.5 KB) - added by Schamschula (Marius Schamschula) 9 years ago.
octave-tsa_4.2.9_mld.diff (7.0 KB) - added by michaelld (Michael Dickens) 9 years ago.

Download all attachments as: .zip

Change History (12)

comment:1 Changed 9 years ago by Schamschula (Marius Schamschula)

Found a workaround to make this work using the illogical octave-1.0 PortGroup: override the patch phase to do the work of both the patch and post-patch phases.

comment:2 Changed 9 years ago by michaelld (Michael Dickens)

Cc: michaelld@… added

Cc Me!

comment:3 Changed 9 years ago by Schamschula (Marius Schamschula)

Updated patchfile to use $(LAPACK_LIBS). This solution does not require the active_variants PortGroup or the reinplace step.

comment:4 Changed 9 years ago by Schamschula (Marius Schamschula)

Removed active_variants line from Portfile.

Last edited 9 years ago by Schamschula (Marius Schamschula) (previous) (diff)

comment:5 Changed 9 years ago by michaelld (Michael Dickens)

I'm attaching a patch that updates octave-tsa as welll as fixes the libgomp issue; or, it does for me :) Please try it out & if it works then we'll go with it.

Changed 9 years ago by michaelld (Michael Dickens)

Attachment: octave-tsa-libgcc.diff added

Changed 9 years ago by Schamschula (Marius Schamschula)

Attachment: Portfile-octave-tsa.diff added

Changed 9 years ago by Schamschula (Marius Schamschula)

Attachment: patch-src-Makefile.diff added

comment:6 Changed 9 years ago by Schamschula (Marius Schamschula)

MIchael,

I tried building octave-tsa after applying your new patch: The Makefile portion of the patch bombed on me.

About that time the Octave Forge guys updated tsa to version 4.2.9. I've updated the Portfile patch accordingly.

I had a hard time reading the patch of the patch file, so I redid my version of the Makefile patch, now it deletes rather than comments out the MatLab specific code. I hope I got all your octave related changes.

tsa 4.2.9 built cleanly under Mavericks with octave +atlas +gcc48 …

For giggles:

2015-01-24: Release of TSA 4.2.9

- support for MacOSX added                
  (tested on Homebrew Octave)

2015-01-18
	maintenance release: fixes minor bugs and configuration issues
Last edited 9 years ago by Schamschula (Marius Schamschula) (previous) (diff)

comment:7 Changed 9 years ago by michaelld (Michael Dickens)

Looks like they disabled libgomp on Darwin; good move for us! I'll attach my "next" diff ... cuts down the Makefile to the bare minimum; adds in explicit directory for mkoctfile as well as "-v" as a flag (for "verbose" output). This works for me on 10.8, octave -atlas +accelerate +g95 ... You'll want to "svn revert" all of the files before applying this patch; it's off of the svn trunk.

Changed 9 years ago by michaelld (Michael Dickens)

Attachment: octave-tsa_4.2.9_mld.diff added

comment:8 Changed 9 years ago by michaelld (Michael Dickens)

Resolution: fixed
Status: newclosed

I just went ahead and committed this fix in r133313.

Note: See TracTickets for help on using tickets.