Opened 12 years ago

Closed 12 years ago

#7827 closed defect (fixed)

Fix atlas-3.8.3.p9 compilation on FreeBSD

Reported by: pjeremy Owned by: pjeremy
Priority: major Milestone: sage-4.3.2
Component: porting: BSD Keywords:
Cc: drkirby, was Merged in: sage-4.3.2.alpha1
Authors: Peter Jeremy Reviewers: David Kirkby, Minh Van Nguyen
Report Upstream: Completely fixed; Fix reported upstream Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description

  • Treat shared libraries the same as Linux - otherwise they aren't correctly detected by (eg) numpy. (sage-specific)

Attachments (1)

7827.atlas.patch (1.1 KB) - added by pjeremy 12 years ago.

Download all attachments as: .zip

Change History (8)

Changed 12 years ago by pjeremy

comment:1 Changed 12 years ago by pjeremy

  • Status changed from new to needs_review

comment:2 Changed 12 years ago by drkirkby

  • Reviewers set to David Kirkby
  • Status changed from needs_review to positive_review

I'm personally unable to verify this works on FreeBSD, but I can certainly see the changes will have no effect on any platform other than FreeBSD. So its a positive from me.

comment:3 Changed 12 years ago by rlm

pjeremy -- There are repositories in the directories themselves, and the best way to post a modification to an spkg is to check in the changes to the mercurial repo, and sage -pkg it up, posting a link to a whole spkg on the ticket. This ticket in particular won't work as is, because #7838 updated from p9 to p10.

comment:4 Changed 12 years ago by mvngu

  • Status changed from positive_review to needs_work

comment:5 Changed 12 years ago by mvngu

  • Reviewers changed from David Kirkby to David Kirkby, Minh Van Nguyen
  • Status changed from needs_work to needs_review

An updated spkg is available at

http://sage.math.washington.edu/home/mvngu/spkg/standard/atlas/atlas-3.8.3.p11.spkg

I committed the patch 7827.atlas.patch in pjeremy's name. The patched version of SpewMakeInc.c is available under patches/. I also patched the installation script spkg-install-script to copy pjeremy's patched patches/SpewMakeInc.c over to src/CONFIG/src/SpewMakeInc.c. The relevant modification is:

diff -r cffdd7ee34e2 spkg-install-script
--- a/spkg-install-script
+++ b/spkg-install-script
@@ -120,6 +120,10 @@
 
 CUR=`pwd`
 echo $CUR
+if [ `uname` = "FreeBSD" ]; then
+    echo Patching SpewMakeInc.c for FreeBSD-specific build
+    cp patches/SpewMakeInc.c src/CONFIG/src/SpewMakeInc.c
+fi
 # add PPC4 7447 CPU and better Itanium2 detection:
 echo Deal with PPC4 7447 model and Itanium 2
 cp patches/archinfo_linux.c src/CONFIG/src/backend/archinfo_linux.c

The updated spkg needs another pair of eyes (anyone's, other than mine) to comb through it. If my change to spkg-install-script gets the green light, then the updated spkg can be merged.

comment:6 Changed 12 years ago by drkirkby

  • Status changed from needs_review to positive_review

This looks good. Note there are also some patches to #8039 which needs work, but I suspect will make it into 4.3.2.

Dave

comment:7 Changed 12 years ago by mvngu

  • Merged in set to sage-4.3.2.alpha1
  • Resolution set to fixed
  • Status changed from positive_review to closed

Merged atlas-3.8.3.p11.spkg in the standard spkg repository.

Note: See TracTickets for help on using tickets.