[Libreoffice-commits] core.git: Makefile.in

[Michael Stahl]

 Makefile.in |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 21f8277c6d58eca236fad490ca0b8080a2d21a8c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 22 15:01:12 2017 +0100

    Revert "oss-fuzz runs under docker"
    
    This reverts commit 210f594773455bf49d1cf116f1c48ccf74cb26b4.
    
    Just disable the check if running inside docker
    
    http://stackoverflow.com/questions/23513045/how-to-check-if-a-process-is-running-inside-docker-container
    
    Change-Id: Ib11a2ccb7f0b2bd5e174b9b3adaf8a28474f2908
    Reviewed-on: https://gerrit.libreoffice.org/34544
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 2e56569..cd6c018 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 
 gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
 
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -54,6 +54,14 @@ else # MAKE_RESTARTS
 
 all: build
 
+check-if-root:
+	@if test `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
+		echo; \
+		echo 'No. You make ME a sandwich.'; \
+		echo; \
+		exit 1; \
+	fi
+
 gb_Side ?= host
 
 include $(BUILDDIR)/config_$(gb_Side).mk
@@ -243,7 +251,7 @@ endif
 #
 # Bootstrap
 #
-bootstrap: compilerplugins
+bootstrap: check-if-root compilerplugins
 
 #
 # Build