#15580: Integrate prereq in the new build system
-------------------------------------+-------------------------------------
       Reporter:  jdemeyer           |        Owner:
           Type:  defect             |       Status:  needs_work
       Priority:  blocker            |    Milestone:  sage-6.1
      Component:  distribution       |   Resolution:
       Keywords:                     |    Merged in:
        Authors:  R. Andrew Ohana,   |    Reviewers:  R. Andrew Ohana
  Jeroen Demeyer                     |  Work issues:
Report Upstream:  N/A                |       Commit:
         Branch:  u/ohanar/prereq    |  43b696f7f53f21e9a08f8a01a3fe0480e1c3a448
   Dependencies:  #15596             |     Stopgaps:
-------------------------------------+-------------------------------------

Comment (by jdemeyer):

 I think this is sufficient
 {{{
 #!diff
 commit 0255a2a53e9aebaf54c0fab335ef0202a6b77ae8
 Author: Jeroen Demeyer <[email protected]>
 Date:   Mon Dec 30 12:47:06 2013 +0100

     Allow sage --sdist without building Sage

 diff --git a/src/bin/sage-clone-source b/src/bin/sage-clone-source
 index aabc452..090466b 100755
 --- a/src/bin/sage-clone-source
 +++ b/src/bin/sage-clone-source
 @@ -20,7 +20,7 @@ SRC="$1"
  DST="$2"

  rm -rf "$DST"
 -mkdir "$DST"
 +mkdir -p "$DST"

  git clone "$SRC" "$DST"

 diff --git a/src/bin/sage-sdist b/src/bin/sage-sdist
 index 3a554b6..1aee0cc 100755
 --- a/src/bin/sage-sdist
 +++ b/src/bin/sage-sdist
 @@ -46,7 +46,9 @@ sage-clone-source "$SAGE_ROOT" "$TMP_DIR/$TARGET"
  # Download and copy all upstream tarballs (the -B option to make forces
  # all targets to be built unconditionally)
  cd "$SAGE_ROOT/build"
 -SAGE_INSTALL_GCC=yes SAGE_SPKG_OPTS="-f -d"
 SAGE_SPKG_COPY_UPSTREAM="$TMP_DIR/$TARGET/upstream" ./install -B all
 +SAGE_INSTALL_GCC=yes SAGE_SPKG_COPY_UPSTREAM="$TMP_DIR/$TARGET/upstream"
 \
 +SAGE_INSTALL_FETCH_ONLY=yes SAGE_SPKG_OPTS="-f -d" \
 +./install -B all

  # Create source .tar.gz
  cd "$TMP_DIR"
 }}}

--
Ticket URL: <http://trac.sagemath.org/ticket/15580#comment:22>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, 
and MATLAB

-- 
You received this message because you are subscribed to the Google Groups 
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to