Ticket #14556: maxima-5.29.1.p3.diff

File maxima-5.29.1.p3.diff, 2.4 KB (added by jdemeyer, 9 years ago)
  • SPKG.txt

    # HG changeset patch
    # User Jeroen Demeyer <jdemeyer@cage.ugent.be>
    # Date 1369395711 -7200
    # Node ID 6e8d23645e49b2b84ba43a0fe4e289b17a3d1958
    # Parent  8401f00511b74a8e44e3b75caa78d58b78f61b38
    Trac #14556: various fixes in spkg-install and spkg-src
    
    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    4040
    4141== Changelog ==
    4242
     43=== maxima-5.29.1.p3 (Jeroen Demeyer, 24 June 2013) ===
     44 * #14556: fix improper quoting in spkg-src script
     45 * Remove redirection of stdout/stderr on OS X (why was that needed?)
     46 * Redirect stdin from /dev/null to avoid interactive prompts during
     47   install
     48
    4349=== maxima-5.29.1.p2 (Julien Puydt, 11 May 2013) ===
    4450 * #14556: don't create the maxima-noreadline script, which is now useless
    4551   (it dated back to when sage was using clisp instead of ecl)
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    a b  
    1515    fi
    1616}
    1717
     18# Sometimes, ECL gives interactive prompts when something goes wrong
     19# during the build. Avoid this by redirecting stdin from /dev/null.
     20# See http://trac.sagemath.org/sage_trac/ticket/11884#comment:34
     21exec </dev/null
     22
     23
    1824# We don't have to set up CFLAGS etc., since these are taken from ECL
    1925# (i.e., ECL uses the ones that were specified when ECL was built).
    2026
    21 MAKE="$MAKE -j1"  # force sequential build (1 job)
     27export MAKE="$MAKE -j1"  # force sequential build (1 job)
    2228
    2329CUR=`pwd`
    2430
     
    5056
    5157
    5258echo
    53 if [[ "$UNAME" = "Darwin" ]]; then
    54     echo "Now building Maxima; this takes a few minutes."
    55     echo "Since we're on MacOS X and there is a very weird"
    56     echo "bug with buffered output while building Maxima,"
    57     echo "you will not be able to see the output of the build"
    58     echo "as it occurs.  Don't worry, the build process does"
    59     echo "not hang."
    60     $MAKE >> "$CUR"/output.log  2>> "$CUR"/error.log
    61 else
    62     echo "Now building Maxima..."
    63     $MAKE
    64 fi
     59echo "Now building Maxima..."
     60$MAKE
    6561check_error "Failed to build Maxima."
    6662
    6763
  • spkg-src

    diff --git a/spkg-src b/spkg-src
    a b  
    44
    55def cmd(x):
    66    print x
     7    sys.stdout.flush()
    78    if os.system(x):
    89        print "(Failed.)"
    910
    10 cmd('rm "src/doc/info/figures/*.pdf"')
     11cmd('rm src/doc/info/figures/*.pdf')
    1112
    1213for X in ['de', 'de.utf8', 'es', 'es.utf8', 'pt', 'pt.utf8', 'pt_BR', 'pt_BR.utf8']:
    13     cmd('rm -rf "src/doc/info/%s/"*'%X)
     14    cmd('rm -r src/doc/info/%s/*'%X)
    1415    open('src/doc/info/%s/Makefile.in'%X,'w').write('all:\n\tls\n\n')