diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-20 10:28:52 -0500 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-02-20 10:28:52 -0500 |
| commit | 5a44c1ff07a7ca47fe6c85e0239af2037b813d29 (patch) | |
| tree | 248529907bd11c5c4d961f6f5c5cb3ce27bfdfaf | |
| parent | 5a9e6f92fe1001afa1fec000be7fdb9bb1c681f0 (diff) | |
| download | html5ks-5a44c1ff07a7ca47fe6c85e0239af2037b813d29.tar.xz html5ks-5a44c1ff07a7ca47fe6c85e0239af2037b813d29.zip | |
popbpoi
| -rwxr-xr-x | .travis.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | setup.sh | 9 |
3 files changed, 7 insertions, 6 deletions
@@ -18,7 +18,7 @@ case "$1" in mv *.rpyc unrpyc ;; install) - MAKEOPTS="-j`nproc` -s" + MAKEOPTS="-j`nproc` ${MAKEOPTS}" sudo apt-get install -q libtheora-dev libvpx-dev libx264-dev yasm diff --git a/.travis.yml b/.travis.yml index 4d4b5df..129e01a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: c python: "3.3" node_js: "0.11" -env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" +env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" MAKEOPTS="-s" before_install: ./.travis.sh before_install install: ./.travis.sh install script: ./setup.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash -if [ -z $MAKEOPTS ]; then - MAKEOPTS="-j`nproc`" - echo "No MAKEOPTS specified, setting $MAKEOPTS automatically." +if ! grep -q -- -j <<< "$MAKEOPTS"; then + MAKEOPTS="-j`nproc` $MAKEOPTS" + echo "No -j detected, setting $MAKEOPTS automatically." printf "%sGiB free RAM, approx 1GiB/core required (depending on ffmpeg settings)." "$(free -gt | tail -n 1 | awk '{print $4}')" fi @@ -11,6 +11,7 @@ set -e -x cd $(dirname $0) cd unrpyc +# silence build failure make $MAKEOPTS install || true cd .. |