Date: Thu, 26 Mar 1998 21:32:05 +0100 From: Eivind Eklund <eivind@yes.no> To: am@f1.ru Cc: freebsd-hackers@FreeBSD.ORG Subject: Re: list of install exclusions for `make world' Message-ID: <19980326213205.04948@follo.net> In-Reply-To: <19980326151528.46729@follo.net>; from Eivind Eklund on Thu, Mar 26, 1998 at 03:15:28PM %2B0100 References: <19980325213106.34958@follo.net> <199803261204.PAA09236@px.f1.ru> <19980326151528.46729@follo.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Mar 26, 1998 at 03:15:28PM +0100, Eivind Eklund wrote:
> > But of course if you are planning to do something more universal - it
> > would be nice. What is estimate time to release some kind of `alpha'?
>
> Unknown, since the total amount of work in what I'm doing is about
> three hours, including testing. It is just a question of taking that
> time :-) If you need it, I can try to have it ready by monday.
Following up on my own comment: Here are the patches. It's not quite
monday yet, but these aren't heavily tested yet, so it probably won't
be in the tree before monday anyway.
Feedback (both negative and positive) welcome.
Eivind.
Index: bsd.subdir.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.subdir.mk,v
retrieving revision 1.22
diff -u -r1.22 bsd.subdir.mk
--- bsd.subdir.mk 1998/03/26 16:02:44 1.22
+++ bsd.subdir.mk 1998/03/26 20:20:25
@@ -20,6 +20,13 @@
# Each of the targets will execute the same target in the
# subdirectories.
#
+# SDIR_OVERRIDE A directory-tree that contains overrides for
+# corresponding build subdirs.
+# Each override is a file containing one subdirname per line:
+# 'subdirlist' is a pure override
+# 'subdirdrop' removes directories from the build
+# 'subdiradd' adds directories to the build
+#
# +++ targets +++
#
# distribute:
@@ -34,9 +41,21 @@
.MAIN: all
+.if exists(${SDIR_OVERRIDE}/${DIRPRFX}/subdirlist)
+SUBDIR!=cat ${SDIR_OVERRIDE}/${DIRPRFX}/subdirlist
+.endif
+
+.if exists(${SDIR_OVERRIDE}/${DIRPRFX}/subdiradd)
+_SUBDIR_EXTRA!=cat ${SDIR_OVERRIDE}/${DIRPRFX}/subdiradd
+.endif
+
_SUBDIRUSE: .USE
- @for entry in ${SUBDIR}; do \
- (if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
+ @for entry in ${SUBDIR} ${_SUBDIR_EXTRA}; do \
+ (if ! (test -f ${SDIR_OVERRIDE}/${DIRPRFX}/subdirdrop && \
+ grep -w $${entry} \
+ ${SDIR_OVERRIDE}/${DIRPRFX}/subdirdrop \
+ > /dev/null); then \
+ if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \
${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE}"; \
edir=$${entry}.${MACHINE}; \
cd ${.CURDIR}/$${edir}; \
@@ -44,8 +63,12 @@
${ECHODIR} "===> ${DIRPRFX}$$entry"; \
edir=$${entry}; \
cd ${.CURDIR}/$${edir}; \
+ fi; \
+ ${MAKE} ${.TARGET:realinstall=install} \
+ SDIR_OVERRIDE=${SDIR_OVERRIDE} \
+ DIRPRFX=${DIRPRFX}$$edir/; \
fi; \
- ${MAKE} ${.TARGET:realinstall=install} DIRPRFX=${DIRPRFX}$$edir/); \
+ ); \
done
${SUBDIR}::
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980326213205.04948>