Ticket #11959: trac_11959-root-delta1to2.patch

File trac_11959-root-delta1to2.patch, 4.3 KB (added by John Palmieri, 11 years ago)

for review only

  • Makefile

    diff --git a/Makefile b/Makefile
    a b all: doc # (already) indirectly depends  
    4343#      test -x $@ # or make it executable if it exists; sanity check only anyway
    4444
    4545build: $(PIPE)
    46        cd spkg && "../$(PIPE)" "./install all 2>&1" "tee -a ../install.log"
     46       cd spkg && \
     47       "../$(PIPE)" \
     48               "env SAGE_PARALLEL_SPKG_BUILD='$(SAGE_PARALLEL_SPKG_BUILD)' ./install all 2>&1" \
     49               "tee -a ../install.log"
    4750
    4851build-serial: SAGE_PARALLEL_SPKG_BUILD = no
    4952build-serial: build
  • README.txt

    diff --git a/README.txt b/README.txt
    a b 3. Extract the Sage source tarball and c 
    179179   You might in addition pass a "-l" flag to "make": this
    180180   sets a load limit, so for example if you execute
    181181
    182        export MAKE="make -j4 -l2.5"
     182       export MAKE="make -j4 -l5.5"
    183183
    184184   then "make" won't start more than one job at a time if the system
    185    load average is above 2.5.  See
     185   load average is above 5.5.  See
    186186   http://www.gnu.org/software/make/manual/make.html#Options-Summary
    187187   and http://www.gnu.org/software/make/manual/make.html#Parallel.
    188188
    to find error messages. If an spkg fail 
    257257process will stop soon after, so check the most recent log files
    258258first, or run
    259259
    260    grep "An error occurred" spkg/logs/*
     260   grep -li "An error" spkg/logs/*
    261261
    262262from the top-level Sage directory to find log files with error
    263263messages in them.  Send (a small part of) the relevant log file to the
  • spkg/install

    diff --git a/spkg/install b/spkg/install
    a b export ZODB 
    428428ZNPOLY=`$newest zn_poly`
    429429export ZNPOLY
    430430
     431# If the user (or the Makefile) has set SAGE_PARALLEL_SPKG_BUILD=no,
     432# then turn off parallel building by writing .NOTPARALLEL to
     433# spkg/standard/parallel_make.cfg.  Otherwise clear that file.
     434if [[ ${SAGE_PARALLEL_SPKG_BUILD:-yes} = no ]]; then
     435    # Disable just building multiple packages at the same time; individual
     436    # spkgs still get built in parallel if they support it and '--jobs'
     437    # in $MAKE is greater than one (and at all specified):
     438    echo ".NOTPARALLEL:" > "$SAGE_ROOT"/spkg/parallel_make.cfg
     439else
     440    # Create an (almost) empty file, s.t. including it from spkg/standard/deps
     441    # doesn't raise an error, thereby also invalidating any previous setting:
     442    echo > "$SAGE_ROOT"/spkg/parallel_make.cfg
     443fi
    431444
    432445# Skip the rest if nothing to do (i.e., to [re]build):
    433446# If "make" doesn't understand the -q option (although we require
    echo "*** ALL ENVIRONMENT VARIABLES BEFO 
    443456env | sort
    444457echo "***********************************************"
    445458
    446 # If the user (or the Makefile) has set SAGE_PARALLEL_SPKG_BUILD=no,
    447 # then turn off parallel building by writing .NOTPARALLEL to
    448 # spkg/standard/parallel_make.cfg.  Otherwise clear that file.
    449 if [[ ${SAGE_PARALLEL_SPKG_BUILD:-yes} = no ]]; then
    450     # Disable just building multiple packages at the same time; individual
    451     # spkgs still get built in parallel if they support it and '--jobs'
    452     # in $MAKE is greater than one (and at all specified):
    453     echo ".NOTPARALLEL:" > "$SAGE_ROOT"/spkg/parallel_make.cfg
    454 else
    455     # Create an (almost) empty file, s.t. including it from spkg/standard/deps
    456     # doesn't raise an error, thereby also invalidating any previous setting:
    457     echo > "$SAGE_ROOT"/spkg/parallel_make.cfg
    458 fi
    459 
    460459###############################################################################
    461460# NOW do the actual build:
    462461###############################################################################
  • spkg/standard/deps

    diff --git a/spkg/standard/deps b/spkg/standard/deps
    a b INSTALL = $(SAGE_ROOT)/spkg/pipestatus 
    1111###############################################################################
    1212# The file parallel_make.cfg is either empty (build in parallel) or
    1313# contains ".NOTPARALLEL:" (build serially).  This file is written
    14 # by spkg/install.
     14# by spkg/install.  This setting has no effect on sub-makes -- it
     15# only determines whether more than spkg may be built at a time.
    1516###############################################################################
    16 include parallel_make.cfg
     17include $(SAGE_ROOT)/spkg/parallel_make.cfg
    1718
    1819###############################################################################
    1920# The base system; required in order to run sage-spkg