You are right, the merge that I did did not correctly merge the different Makefile changes.
Could you send that patch? I also found that in g0n/Makefile on some machines I need to do export NF_DIR=tmp_nf_dir && ./tmanin < tmanin.in > t 2>/dev/null && diff t tmanin.out instead of > NF_DIR=tmp_nf_dir && ./tmanin < tmanin.in > t 2>/dev/null && diff t > tmanin.out as the latter does not always pass the value of NF_DIR to the program (which checks this at runtime via getenv()). There are 6 similar lines. I have to go and get my eyes tested now (too much debugging!) but hope to clear this up by the end of the day (GMT). John On 19/12/2007, mabshoff <[EMAIL PROTECTED]> wrote: > > > > On Dec 19, 2:20 pm, "John Cremona" <[EMAIL PROTECTED]> wrote: > > Hi John, > > > OK, I found out what to do: > > Great. > > > > The new spkg is > > athttp://www.warwick.ac.uk/staff/J.E.Cremona/cremona-20071219.spkg > > and linked from the trac page. > > > > I would be grateful if someone could test this. > > I did and it fails to compile for me: > > g++ -c -fPIC -g -O2 -DNEW_OP_ORDER -DUSE_PARI_FACTORING -I../include - > DNTL_ALL -I/tmp/Work-mabshoff/sage-2.9.1.alpha1/local/include -I/tmp/ > Work-mabshoff/sage-2.9.1.alpha1/local/include elog.cc -o elog_n.o > rm -f libcurvesntl.a > ar r libcurvesntl.a curve_n.o curvedata_n.o curvered_n.o points_n.o > heights_n.o cperiods_n.o isogs_n.o mwprocs_n.o lambda_n.o sifter_n.o > sieve_search_n.o htconst_n.o egr_n.o saturate_n.o divpol_n.o > pointsmod_n.o curvemod_n.o ffmod_n.o tlss_n.o elog_n.o > ar: creating libcurvesntl.a > ranlib libcurvesntl.a > g++ -o ./tpoints tpoints_n.o -L../lib -lcurvesntl -ljcntl -L../lib - > lpari -L/tmp/Work-mabshoff/sage-2.9.1.alpha1/local/lib -L/tmp/Work- > mabshoff/sage-2.9.1.alpha1/local/lib -lntl -L../lib -lgmp -lpari -lm > /usr/bin/ld: cannot find -lcurvesntl > collect2: ld returned 1 exit status > make[3]: *** [tpoints] Error 1 > make[3]: Leaving directory `/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/ > build/cremona-20071219/src/qcurves' > make[2]: *** [all] Error 2 > make[2]: Leaving directory `/tmp/Work-mabshoff/sage-2.9.1.alpha1/spkg/ > build/cremona-20071219/src' > Error building cremona > > I assume this happens because we need to build and install the dynamic > libraries before building the tests. That is one of the changes in the > main makefile you might have reverted while resolving the merge > conflict. I can fix it in the makefile and I will send you the patch. > > > John > > Cheers, > > Michael > > > -- John Cremona --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to sage-devel@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/sage-devel URLs: http://sage.scipy.org/sage/ and http://modular.math.washington.edu/sage/ -~----------~----~----~----~------~----~------~--~---