From 530d8b82adcf5fd2188eb04a5dd2c9cbc0f72188 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@cvs.openbsd.org>
Date: Sat, 19 Nov 2016 14:22:06 +0000
Subject: Enable builds with a dedicated user for xenocara as well.

"push forward" deraadt; no objections matthieu; testing, input & ok rpe
---
 share/mk/bsd.xorg.mk | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'share')

diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index 6fee795aa..92452bbc5 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.56 2016/10/14 10:14:00 natano Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.57 2016/11/19 14:22:05 tb Exp $ -*- makefile  -*-
 #
 # Copyright © 2006,2012 Matthieu Herrb
 #
@@ -226,18 +226,23 @@ _SUBDIRUSE:
 
 _xenocara_obj! _SUBDIRUSE
 	@cd $(.CURDIR); \
+	umask ${WOBJUMASK}; \
+	here=`/bin/pwd`; xsrcdir=`cd $(XSRCDIR); /bin/pwd`; \
+	subdir=$${here#$${xsrcdir}/}; \
 	if [[ `id -u` -eq 0 && ${BUILDUSER} != root ]]; then \
-		SETOWNER="chown -h ${BUILDUSER}"; \
-		_mkdirs() { \
-			su ${BUILDUSER} -c "mkdir -p $$1"; \
-		}; \
-		MKDIRS=_mkdirs; \
+		SETOWNER="chown -h ${BUILDUSER}:${WOBJGROUP}"; \
+		if [[ $$here != $$subdir ]]; then \
+			_mkdirs() { \
+				su ${BUILDUSER} -c "mkdir -p $$1"; \
+			}; \
+			MKDIRS=_mkdirs; \
+		fi; \
+	elif [[ $$here == $$subdir ]]; then \
+		SETOWNER="chown :${WOBJGROUP}"; \
 	else \
-		MKDIRS="mkdir -p"; \
 		SETOWNER=:; \
 	fi; \
-	here=`/bin/pwd`; xsrcdir=`cd $(XSRCDIR); /bin/pwd`; \
-	subdir=$${here#$${xsrcdir}/}; \
+	[[ -z $$MKDIRS ]] && MKDIRS="mkdir -p"; \
 	if test $$here != $$subdir ; then \
 	    dest=${XOBJDIR}/$$subdir; \
 	    echo "$$here/${__objdir} -> $$dest"; \
@@ -261,6 +266,7 @@ _xenocara_obj! _SUBDIRUSE
 	    if test ! -d ${__objdir}; then \
 		echo "making $$dest"; \
 		$$MKDIRS $$dest; \
+		$$SETOWNER $$dest; \
 	    fi ; \
 	fi
 . endif
-- 
cgit v1.2.3