aboutsummaryrefslogtreecommitdiffstats
path: root/lang/rust
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2016-03-28 01:10:15 +0800
committerriggs <riggs@FreeBSD.org>2016-03-28 01:10:15 +0800
commit98994a57f73bc9c972612c96d8a5149194be4562 (patch)
tree3cba3e9925e03befe3416a5ec5953a4a48a7adfc /lang/rust
parent3daafc05ea4aad58b2db46b218b936c5a2e6a4af (diff)
downloadfreebsd-ports-gnome-98994a57f73bc9c972612c96d8a5149194be4562.tar.gz
freebsd-ports-gnome-98994a57f73bc9c972612c96d8a5149194be4562.tar.zst
freebsd-ports-gnome-98994a57f73bc9c972612c96d8a5149194be4562.zip
Fix staging error on systems where security/sudo is present
PR: 207930 Reported by: pete@hayes.id.au, kib (via mail)
Diffstat (limited to 'lang/rust')
-rw-r--r--lang/rust/files/patch-mk_install.mk28
1 files changed, 28 insertions, 0 deletions
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