[Libreoffice-commits] online.git: 2 commits - configure.ac debian/rules Makefile.am

[Andras Timar]

 Makefile.am  |    1 -
 configure.ac |   29 -----------------------------
 debian/rules |    2 +-
 3 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit 04539cc00ce3bea1483b882244408ac838a1a623
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Mar 9 12:49:02 2018 +0100

    Revert "enable make parallelism"
    
    Bad idea, 'make check' does not tolerate parallelism.
    
    This reverts commit 2e4ecfaf4475fd13c510c186f8f79c1cd38228c6.

diff --git a/Makefile.am b/Makefile.am
index 1e581e057..cd3133820 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-AM_MAKEFLAGS = @PARALLELISM_OPTION@
 SUBDIRS = . test loleaflet
 
 export ENABLE_DEBUG
diff --git a/configure.ac b/configure.ac
index 6f101a259..4b06186e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,35 +121,6 @@ AC_ARG_ENABLE([werror],
             AS_HELP_STRING([--disable-werror],
                           [Do not turn warnings into errors.]))
 
-AC_ARG_WITH(parallelism,
-    AS_HELP_STRING([--with-parallelism],
-        [Number of jobs to run simultaneously during build. Parallel builds can
-        save a lot of time on multi-cpu machines. Defaults to the number of
-        CPUs on the machine.]),
-,)
-
-# Number of CPUs to use during the build
-AC_MSG_CHECKING([for number of processors to use])
-# plain --with-parallelism is just the default
-if test -n "$with_parallelism" -a "$with_parallelism" != "yes"; then
-    if test "$with_parallelism" = "no"; then
-        PARALLELISM=0
-    else
-        PARALLELISM=$with_parallelism
-    fi
-else
-    PARALLELISM=`getconf _NPROCESSORS_ONLN`
-fi
-
-if test $PARALLELISM -eq 0; then
-    AC_MSG_RESULT([explicit make -j option needed])
-    PARALLELISM_OPTION=
-else
-    AC_MSG_RESULT([$PARALLELISM])
-    PARALLELISM_OPTION="-j $PARALLELISM"
-fi
-AC_SUBST(PARALLELISM_OPTION)
-
 # Handle options
 AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
       [POCO_DEBUG_SUFFIX=d],
commit 5fb16d423dd0fde18b8dee8eb77aa425516a37f9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Mar 9 12:48:38 2018 +0100

    enable parallel make with deb package creation
    
    Change-Id: Ia84ca8a33a27cac8f1fcc3668a97ee3857d3c0d8

diff --git a/debian/rules b/debian/rules
index fe3d10b33..d675675c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ CONFFLAGS = --enable-silent-rules --prefix=/usr --localstatedir=/var --sysconfdi
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with=systemd
+	dh $@ --with=systemd --parallel
 
 override_dh_auto_configure:
 	./configure $(CONFFLAGS)