Opened 5 years ago

Closed 4 years ago

#1516 closed patch (fixed)

Fixes for aimk issues on Mac OS X

Reported by: tourist Owned by: dlove
Priority: normal Milestone:
Component: sge Version: 8.1.8
Severity: major Keywords:
Cc: cestark@…

Description

The OS X build is broken as aimk and arch are not properly getting the release version info. Both are using "uname -r" and this will give numbers like 13.4 rather than 10.9 or some meaningful number that's expected below. A few edits set us right however, using "sw_vers" rather than uname and dealing with the fact that OS X's deadline doesn't use -f the same way:

diff dist/util/arch ~/Downloads/sge-8.1.8/source/dist/util/arch
107d106
< osrelease=/usr/bin/sw_vers -productVersion
109c108
< i386 | x86_64)
---

i386)

114,117c113
< 10.[2-9].*)
< darwin_machine=x64
< ;;
< 10.10.*)
---

10.[2-8].*)

132d127
<

diff aimk.site ~/Downloads/sge-8.1.8/source/aimk.site
39d38
< case "darwin-x64":
97,101c96
< if ( $buildarch == "darwin-x64" ) then
< set JAVAC_BIN = readlink "$JAVAC_BIN"
< else
< set JAVAC_BIN = readlink -f "$JAVAC_BIN"
< endif
---

set JAVAC_BIN = readlink -f "$JAVAC_BIN"

diff aimk ~/Downloads/sge-8.1.8/source/aimk
458a459

1090d1090
< set REL = /usr/bin/sw_vers -productVersion

A few more things will be needed still to have a successful build, but they're at later stages and will be in a different ticket.

Craig

Attachments (2)

patch-preview.txt (1.7 KB) - added by wish 5 years ago.
Added by email2trac
fix-_1516_-get-link-target-with-bare-readlink-and-os-release-from-sw_vers-on-macos-x.dpatch (83.9 KB) - added by wish 5 years ago.
Added by email2trac

Download all attachments as: .zip

Change History (5)

comment:1 Changed 5 years ago by wish

  • Owner set to wish
  • Status changed from new to accepted
  • Type changed from defect to patch

I've followed the instructions implied in the patch as far as seems sensible and produced a patch
in darcs that is essentially the same. I will try to do a test build on the work Macs.

comment:2 Changed 5 years ago by wish

  • Owner changed from wish to dlove
  • Status changed from accepted to assigned

1 patch for repository http://arc.liv.ac.uk/repos/darcs/sge:

Sat May 16 15:15:50 BST 2015 William Hay (AKA w.hay@…) <wish@…>

  • Fix #1516: get link target with bare readlink and OS release from sw_vers on MacOS X This patch was created by examining the context free diff submitted by Craig <cestark@…> and manually making the changes it made where they seem sensible.

patch-preview.txt

fix-_1516_-get-link-target-with-bare-readlink-and-os-release-from-sw_vers-on-macos-x.dpatch

Changed 5 years ago by wish

Added by email2trac

comment:3 Changed 4 years ago by William Hay (AKA w.hay@…>

  • Resolution set to fixed
  • Status changed from assigned to closed

In 4827/sge:

Fix #1516: get link target with bare readlink and OS release from sw_vers on MacOS X
This patch was created by examining the context free diff submitted by Craig <cestark@…>
and manually making the changes it made where they seem sensible.

Note: See TracTickets for help on using tickets.