Ticket #14556: maxima-5.29.1.p3.diff

SPKG.txt

@@ -40 +40 @@
 
 == Changelog ==
 
+=== maxima-5.29.1.p3 (Jeroen Demeyer, 24 June 2013) ===
+ * #14556: fix improper quoting in spkg-src script
+ * Remove redirection of stdout/stderr on OS X (why was that needed?)
+ * Redirect stdin from /dev/null to avoid interactive prompts during
+   install
+
 === maxima-5.29.1.p2 (Julien Puydt, 11 May 2013) ===
  * #14556: don't create the maxima-noreadline script, which is now useless
    (it dated back to when sage was using clisp instead of ecl)

spkg-install

@@ -15 +15 @@
     fi
 }
 
+# Sometimes, ECL gives interactive prompts when something goes wrong
+# during the build. Avoid this by redirecting stdin from /dev/null.
+# See http://trac.sagemath.org/sage_trac/ticket/11884#comment:34
+exec </dev/null
+
+
 # We don't have to set up CFLAGS etc., since these are taken from ECL
 # (i.e., ECL uses the ones that were specified when ECL was built).
 
-MAKE="$MAKE -j1"  # force sequential build (1 job)
+export MAKE="$MAKE -j1"  # force sequential build (1 job)
 
 CUR=`pwd`
 
@@ -50 +56 @@
 
 
 echo
-if [[ "$UNAME" = "Darwin" ]]; then
-    echo "Now building Maxima; this takes a few minutes."
-    echo "Since we're on MacOS X and there is a very weird"
-    echo "bug with buffered output while building Maxima,"
-    echo "you will not be able to see the output of the build"
-    echo "as it occurs.  Don't worry, the build process does"
-    echo "not hang."
-    $MAKE >> "$CUR"/output.log  2>> "$CUR"/error.log
-else
-    echo "Now building Maxima..."
-    $MAKE
-fi
+echo "Now building Maxima..."
+$MAKE
 check_error "Failed to build Maxima."
 
 

spkg-src

@@ -4 +4 @@
 
 def cmd(x):
     print x
+    sys.stdout.flush()
     if os.system(x):
         print "(Failed.)"
 
-cmd('rm "src/doc/info/figures/*.pdf"')
+cmd('rm src/doc/info/figures/*.pdf')
 
 for X in ['de', 'de.utf8', 'es', 'es.utf8', 'pt', 'pt.utf8', 'pt_BR', 'pt_BR.utf8']:
-    cmd('rm -rf "src/doc/info/%s/"*'%X)
+    cmd('rm -r src/doc/info/%s/*'%X)
     open('src/doc/info/%s/Makefile.in'%X,'w').write('all:\n\tls\n\n')