build: increase make parallel jobs count

koreader · Jan 9, 2016 · 9bad2e8 · 9bad2e8
1 parent 1028c91
commit 9bad2e8
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 33 deletions.
diff --git a/thirdparty/cmake_modules/koreader_thirdparty_common.cmake b/thirdparty/cmake_modules/koreader_thirdparty_common.cmake
@@ -25,6 +25,10 @@ if(NOT DEFINED PROCESSOR_COUNT)
   endif()
 endif()
 
+if(NOT DEFINED PARALLEL_JOBS)
+    math(EXPR PARALLEL_JOBS "${PROCESSOR_COUNT}+1")
+endif()
+
 macro(assert_var_defined varName)
     if(NOT DEFINED ${varName})
         message(FATAL_ERROR "${varName} variable not defined!")

diff --git a/thirdparty/czmq/CMakeLists.txt b/thirdparty/czmq/CMakeLists.txt
@@ -42,6 +42,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND ./autogen.sh COMMAND ${PATCH_CMD1} COMMAND ${PATCH_CMD2}
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR} COMMAND sh -c ${SED_CMD1_STR} COMMAND sh -c ${SED_CMD2_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     INSTALL_COMMAND $(MAKE) --silent installdirs uninstall install
 )
diff --git a/thirdparty/djvulibre/CMakeLists.txt b/thirdparty/djvulibre/CMakeLists.txt
@@ -35,7 +35,7 @@ ExternalProject_Add(
     PATCH_COMMAND NOCONFIGURE=1 ./autogen.sh
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR} COMMAND sed -i "s|-lstdc++||g" libtool
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} SUBDIRS_FIRST=libdjvu --silent
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} SUBDIRS_FIRST=libdjvu --silent
     # skip install
     INSTALL_COMMAND ""
 )
diff --git a/thirdparty/filemq/CMakeLists.txt b/thirdparty/filemq/CMakeLists.txt
@@ -38,6 +38,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND ./autogen.sh
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR} COMMAND sh -c ${SED_CMD1_STR} COMMAND sh -c ${SED_CMD2_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     INSTALL_COMMAND $(MAKE) --silent installdirs uninstall install
 )
diff --git a/thirdparty/freetype2/CMakeLists.txt b/thirdparty/freetype2/CMakeLists.txt
@@ -31,6 +31,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND ./autogen.sh
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT}
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS}
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/gettext/CMakeLists.txt b/thirdparty/gettext/CMakeLists.txt
@@ -28,6 +28,6 @@ ExternalProject_Add(
     URL_MD5 eae24a623e02b33e3e1024adff9a5a08
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/giflib/CMakeLists.txt b/thirdparty/giflib/CMakeLists.txt
@@ -21,6 +21,6 @@ ExternalProject_Add(
     URL_MD5 801fffd6fcfbac9ee99d3ea929828688
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/glib/CMakeLists.txt b/thirdparty/glib/CMakeLists.txt
@@ -56,6 +56,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND NOCONFIGURE=1 ./autogen.sh
     CONFIGURE_COMMAND sh -c ${gen_arm_config} COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT}
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS}
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} install
 )
diff --git a/thirdparty/libiconv/CMakeLists.txt b/thirdparty/libiconv/CMakeLists.txt
@@ -23,6 +23,6 @@ ExternalProject_Add(
     URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/libjpeg-turbo/CMakeLists.txt b/thirdparty/libjpeg-turbo/CMakeLists.txt
@@ -30,6 +30,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND libtoolize COMMAND aclocal COMMAND autoheader COMMAND autoconf COMMAND automake --force-missing --add-missing
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/libk2pdfopt/CMakeLists.txt b/thirdparty/libk2pdfopt/CMakeLists.txt
@@ -23,7 +23,7 @@ assert_var_defined(STDCPPLIB)
 
 ep_get_source_dir(SOURCE_DIR)
 
-set(BUILD_CMD_STR "$(MAKE) -j${PROCESSOR_COUNT} BUILDMODE=shared HOST=${HOST} CC=\"${CC}\" CFLAGS=\"${CFLAGS} -O3\"")
+set(BUILD_CMD_STR "$(MAKE) -j${PARALLEL_JOBS} BUILDMODE=shared HOST=${HOST} CC=\"${CC}\" CFLAGS=\"${CFLAGS} -O3\"")
 set(BUILD_CMD_STR "${BUILD_CMD_STR} CXX=\"${CXX}\" CXXFLAGS=\"${CXXFLAGS}\" AR=\"${AR}\" ZLIB=${ZLIB}")
 set(BUILD_CMD_STR "${BUILD_CMD_STR} TESSERACT_DIR=${TESSERACT_DIR} LEPTONICA_DIR=${LEPTONICA_DIR}")
 set(BUILD_CMD_STR "${BUILD_CMD_STR} LEPT_CFLAGS=\"${CFLAGS} -I${ZLIB_DIR} -I${PNG_DIR}/include\"")

diff --git a/thirdparty/libpng/CMakeLists.txt b/thirdparty/libpng/CMakeLists.txt
@@ -25,6 +25,6 @@ ExternalProject_Add(
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     # PATCH_COMMAND sh autogen.sh
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/libzmq/CMakeLists.txt b/thirdparty/libzmq/CMakeLists.txt
@@ -40,6 +40,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND ./autogen.sh COMMAND ${FORCE_DYNAMLIB_VERSION} COMMAND ${SKIP_TEST} COMMAND ${CLEAR_BUILD_DIR}
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR} COMMANd sed -i 's|-lstdc++||g' libtool
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
-    INSTALL_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent install
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
+    INSTALL_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent install
 )
diff --git a/thirdparty/lua-serialize/CMakeLists.txt b/thirdparty/lua-serialize/CMakeLists.txt
@@ -12,7 +12,7 @@ assert_var_defined(OUTPUT_DIR)
 
 ep_get_source_dir(SOURCE_DIR)
 
-set(BUILD_CMD_STR "$(MAKE) -j${PROCESSOR_COUNT} CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" OUTPUT_DIR=${OUTPUT_DIR}")
+set(BUILD_CMD_STR "$(MAKE) -j${PARALLEL_JOBS} CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" OUTPUT_DIR=${OUTPUT_DIR}")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/luajit/CMakeLists.txt b/thirdparty/luajit/CMakeLists.txt
@@ -34,7 +34,7 @@ if(${XCOMPILE})
         set(HOST_CC "${CC}")
     endif()
 
-    set(BUILD_CMD_STR "$(MAKE) -j${PROCESSOR_COUNT} CC=\"${CC}\" HOST_CC=\"${HOST_CC}\"")
+    set(BUILD_CMD_STR "$(MAKE) -j${PARALLEL_JOBS} CC=\"${CC}\" HOST_CC=\"${HOST_CC}\"")
     set(BUILD_CMD_STR "${BUILD_CMD_STR} CFLAGS=\"${BASE_CFLAGS}\" HOST_CFLAGS=\"${HOST_CFLAGS}\"")
     if(DEFINED LDFLAGS)
         set(BUILD_CMD_STR "${BUILD_CMD_STR} LDFLAGS=\"${LDFLAGS}\"")
@@ -45,7 +45,7 @@ if(${XCOMPILE})
     set(BUILD_CMD_STR "${BUILD_CMD_STR} TARGET_SONAME=\"${TARGET_SONAME}\" TARGET_CFLAGS=\"${TARGET_CFLAGS}\" TARGET_FLAGS=\"-DLUAJIT_NO_LOG2 -DLUAJIT_NO_EXP2\" CROSS=\"${CROSS}\" amalg")
     set(BUILD_CMD sh -c ${BUILD_CMD_STR})
 else()
-    set(BUILD_CMD $(MAKE) -j${PROCESSOR_COUNT})
+    set(BUILD_CMD $(MAKE) -j${PARALLEL_JOBS})
 endif()
 
 

diff --git a/thirdparty/luasocket/CMakeLists.txt b/thirdparty/luasocket/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 if(DEFINED LUALIB_mingw)
     set(BUILD_CMD_STR "${BUILD_CMD_STR} LUALIB_mingw=\"${LUALIB_mingw}\"")
 endif()
-set(BUILD_CMD_STR "${BUILD_CMD_STR} LUAINC=\"${LUAINC}\" -j${PROCESSOR_COUNT} --silent all")
+set(BUILD_CMD_STR "${BUILD_CMD_STR} LUAINC=\"${LUAINC}\" -j${PARALLEL_JOBS} --silent all")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/minizip/CMakeLists.txt b/thirdparty/minizip/CMakeLists.txt
@@ -16,7 +16,7 @@ assert_var_defined(RANLIB)
 ep_get_source_dir(SOURCE_DIR)
 
 set(PATCH_CMD_STR "sed -i 's|^CC=|#CC=|g' aes/Makefile && sed -i 's|^CFLAGS=|#CFLAGS=|g' aes/Makefile")
-set(BUILD_CMD_STR "$(MAKE) -j${PROCESSOR_COUNT} -C aes CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" AR=\"${AR}\" RANLIB=\"${RANLIB}\"")
+set(BUILD_CMD_STR "$(MAKE) -j${PARALLEL_JOBS} -C aes CC=\"${CC}\" LDFLAGS=\"${LDFLAGS}\" AR=\"${AR}\" RANLIB=\"${RANLIB}\"")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/mupdf/CMakeLists.txt b/thirdparty/mupdf/CMakeLists.txt
@@ -10,11 +10,11 @@ enable_language(C)
 assert_var_defined(HOSTCFLAGS)
 assert_var_defined(HOSTCC)
 assert_var_defined(OS)
-set(BUILD_CMD_GENERATE sh -c "env CFLAGS=\"${HOSTCFLAGS}\" $(MAKE) -j${PROCESSOR_COUNT} generate build=\"release\" CC=\"${HOSTCC}\" verbose=1")
+set(BUILD_CMD_GENERATE sh -c "env CFLAGS=\"${HOSTCFLAGS}\" $(MAKE) -j${PARALLEL_JOBS} generate build=\"release\" CC=\"${HOSTCC}\" verbose=1")
 
 assert_var_defined(LDFLAGS)
 assert_var_defined(XCFLAGS)
-set(STATIC_BUILD_CMD "$(MAKE) -j${PROCESSOR_COUNT}")
+set(STATIC_BUILD_CMD "$(MAKE) -j${PARALLEL_JOBS}")
 set(STATIC_BUILD_CMD "${STATIC_BUILD_CMD} LDFLAGS=\"${LDFLAGS}\" XCFLAGS=\"${XCFLAGS}\"")
 set(STATIC_BUILD_CMD "${STATIC_BUILD_CMD} CC=\"${CC}\" build=\"release\" MUDRAW= MUTOOL= CURL_LIB= OS=${OS}")
 set(STATIC_BUILD_CMD "${STATIC_BUILD_CMD} verbose=1 FREETYPE_DIR=nonexisting JPEG_DIR=nonexisting ZLIB_DIR=nonexisting CROSSCOMPILE=yes")

diff --git a/thirdparty/popen-noshell/CMakeLists.txt b/thirdparty/popen-noshell/CMakeLists.txt
@@ -17,7 +17,7 @@ endif(${LEGACY})
 
 assert_var_defined(AR)
 set(MAKE_ENV_VAR "CC=\"${CC}\" AR=\"${AR}\" CFLAGS=\"${CFLAGS}\"")
-set(BUILD_CMD_STR "$(MAKE) -j${PROCESSOR_COUNT} ${MAKE_ENV_VAR}")
+set(BUILD_CMD_STR "$(MAKE) -j${PARALLEL_JOBS} ${MAKE_ENV_VAR}")
 
 ko_write_gitclone_script(
     GIT_CLONE_SCRIPT_FILENAME

diff --git a/thirdparty/sdcv/CMakeLists.txt b/thirdparty/sdcv/CMakeLists.txt
@@ -39,7 +39,7 @@ ExternalProject_Add(
     BUILD_IN_SOURCE 1
     PATCH_COMMAND sh -c ${PATCH_CMD_STR}
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT}
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS}
     # skip install
     INSTALL_COMMAND ""
 )
diff --git a/thirdparty/tar/CMakeLists.txt b/thirdparty/tar/CMakeLists.txt
@@ -32,7 +32,7 @@ ExternalProject_Add(
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     PATCH_COMMAND patch -N -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/tar-0001-fix-build-failure.patch
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     # skip install for tar
     # NOTE: we always update binary timestamp to notify Make for a fresh build
     INSTALL_COMMAND ${CMAKE_COMMAND} -E touch ${BINARY_DIR}/tar

diff --git a/thirdparty/zlib/CMakeLists.txt b/thirdparty/zlib/CMakeLists.txt
@@ -22,7 +22,7 @@ else()
     # configure
     set(optional_cfg_cmd CONFIGURE_COMMAND sh -c "CC=\"${CC}\" ./configure --prefix=${SOURCE_DIR}")
     # build
-    set(BUILD_CMD $(MAKE) -j${PROCESSOR_COUNT} --silent shared static)
+    set(BUILD_CMD $(MAKE) -j${PARALLEL_JOBS} --silent shared static)
     # install
     set(INSTALL_CMD $(MAKE) install)
 endif()

diff --git a/thirdparty/zsync/CMakeLists.txt b/thirdparty/zsync/CMakeLists.txt
@@ -29,7 +29,7 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND sh -c "cd c && autoreconf -fi"
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     # skip install
     INSTALL_COMMAND ""
 )
diff --git a/thirdparty/zyre/CMakeLists.txt b/thirdparty/zyre/CMakeLists.txt
@@ -38,6 +38,6 @@ ExternalProject_Add(
     DOWNLOAD_COMMAND ${CMAKE_COMMAND} -P ${GIT_CLONE_SCRIPT_FILENAME}
     PATCH_COMMAND ./autogen.sh
     CONFIGURE_COMMAND sh -c ${CFG_CMD_STR} COMMAND sh -c ${SED_CMD1_STR} COMMAND sh -c ${SED_CMD2_STR}
-    BUILD_COMMAND $(MAKE) -j${PROCESSOR_COUNT} --silent
+    BUILD_COMMAND $(MAKE) -j${PARALLEL_JOBS} --silent
     INSTALL_COMMAND $(MAKE) --silent installdirs uninstall install
 )