From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Tue, 17 Feb 2015 20:20:30 +0000 (+0100)
Subject: Revert "Use result of nproc instead of entering a definite number"
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=df3e6520f693c244b2fc0e935b760cdd02d748b0;p=supertux.git

Revert "Use result of nproc instead of entering a definite number"
This fixes build timeouts on Travis
This reverts commit cbcf9cb495916b3f190408dda3c52f02756cce7c.
---

diff --git a/.travis.yml b/.travis.yml
index 90b56455e..66dfc759d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,13 +38,13 @@ before_install:
 
  # CMake
  - wget http://www.cmake.org/files/v3.1/cmake-$CMAKE_VERSION.tar.gz -O - | tar xz
- - (cd cmake-$CMAKE_VERSION && cmake . && make -j $(nproc) && sudo make install)
+ - (cd cmake-$CMAKE_VERSION && cmake . && make -j5 && sudo make install)
 
  # SDL dependencies
  - wget http://libsdl.org/release/SDL2-$SDL2_VERSION.tar.gz -O - | tar xz
- - (cd SDL2-$SDL2_VERSION && ./configure --prefix=/usr && make -j $(nproc) && sudo make install)
+ - (cd SDL2-$SDL2_VERSION && ./configure --prefix=/usr && make -j5 && sudo make install)
  - wget http://www.libsdl.org/projects/SDL_image/release/SDL2_image-$SDL2IMAGE_VERSION.tar.gz -O - | tar xz
- - (cd SDL2_image-$SDL2IMAGE_VERSION && ./configure --prefix=/usr && make -j $(nproc) && sudo make install)
+ - (cd SDL2_image-$SDL2IMAGE_VERSION && ./configure --prefix=/usr && make -j5 && sudo make install)
 
 script:
  # Clean from previous Travis build
@@ -68,7 +68,7 @@ addons:
       description: "Build submitted via Travis CI"
     notification_email: supertux-commit@lists.lethargik.org
     build_command_prepend: "cmake . && make clean"
-    build_command:   "make -j $(nproc)"
+    build_command:   "make -j 4"
     branch_pattern: master
 
 notifications: