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

Caolán McNamara caolanm at redhat.com
Sat Dec 3 20:23:50 UTC 2016


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

New commits:
commit 210f594773455bf49d1cf116f1c48ccf74cb26b4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 3 20:18:20 2016 +0000

    oss-fuzz runs under docker
    
    and builds as root in that env, at least the default out of the box
    experience is that for me, I suppose I could faff around getting it add a
    user specifically for the build like I do for my coverity in docker
    build, or just drop this.
    
    This effectively reverts
    
    commit 466257699559390237615f651ce0f30f07543434
    Author: Tor Lillqvist <tml at collabora.com>
    Date:   Thu Apr 14 09:01:48 2016 +0300
    
        149
    
        Change-Id: I63f055756ff5f571d5ebe89aa4aee52d8ae2c510
    
    I see your 149 and raise you a 1172
    
    Change-Id: I3e81a725cdab1ff5ead0484dbfee11ac8fe303a9

diff --git a/Makefile.in b/Makefile.in
index b763ccc..9b933f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 
 gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
 
-.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)
+.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)
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -54,14 +54,6 @@ else # MAKE_RESTARTS
 
 all: build
 
-check-if-root:
-	@if test `id -u` = 0; then \
-		echo; \
-		echo 'No. You make ME a sandwich.'; \
-		echo; \
-		exit 1; \
-	fi
-
 gb_Side ?= host
 
 include $(BUILDDIR)/config_$(gb_Side).mk
@@ -250,7 +242,7 @@ endif
 #
 # Bootstrap
 #
-bootstrap: check-if-root compilerplugins
+bootstrap: compilerplugins
 
 #
 # Build


More information about the Libreoffice-commits mailing list