From aa3056e4136632388e6f60bc24151cbf0be13b82 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sun, 27 Mar 2016 17:10:15 +0000 Subject: [PATCH] Fix staging error on systems where security/sudo is present PR: 207930 Reported by: pete@hayes.id.au, kib (via mail) --- lang/rust/files/patch-mk_install.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 lang/rust/files/patch-mk_install.mk diff --git a/lang/rust/files/patch-mk_install.mk b/lang/rust/files/patch-mk_install.mk new file mode 100644 index 000000000000..94b5e57b28a3 --- /dev/null +++ b/lang/rust/files/patch-mk_install.mk @@ -0,0 +1,28 @@ +--- mk/install.mk.orig 2016-03-01 19:18:54 UTC ++++ mk/install.mk +@@ -15,12 +15,7 @@ RUN_INSTALLER = cd tmp/empty_dir && \ + --mandir="$(DESTDIR)$(CFG_MANDIR)" + + install: +-ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER))) +-# Build the dist as the original user +- $(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_install +-else + $(Q)$(MAKE) prepare_install +-endif + ifeq ($(CFG_DISABLE_DOCS),) + $(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --disable-ldconfig + endif +@@ -33,12 +28,7 @@ endif + prepare_install: dist-tar-bins | tmp/empty_dir + + uninstall: +-ifeq (root user, $(USER) $(patsubst %,user,$(SUDO_USER))) +-# Build the dist as the original user +- $(Q)sudo -u "$$SUDO_USER" $(MAKE) prepare_uninstall +-else + $(Q)$(MAKE) prepare_uninstall +-endif + ifeq ($(CFG_DISABLE_DOCS),) + $(Q)$(call RUN_INSTALLER,$(DOC_PKG_NAME)-$(CFG_BUILD)) --uninstall + endif