Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets set MAKE="${MAKE:-make} -j 1" to prevent prob...



details:   https://anonhg.NetBSD.org/src/rev/9accc8f75571
branches:  trunk
changeset: 534365:9accc8f75571
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Jul 23 09:02:45 2002 +0000

description:
set  MAKE="${MAKE:-make} -j 1"  to prevent problems where the output
of make -j N>1 would result in junk in various shell variables

diffstat:

 distrib/sets/listpkgs     |  8 ++++----
 distrib/sets/makeflist    |  4 ++--
 distrib/sets/makeobsolete |  8 ++++----
 distrib/sets/makeplist    |  6 +++---
 distrib/sets/makesums     |  3 +--
 distrib/sets/maketars     |  4 ++--
 6 files changed, 16 insertions(+), 17 deletions(-)

diffs (122 lines):

diff -r d52dd3a9c550 -r 9accc8f75571 distrib/sets/listpkgs
--- a/distrib/sets/listpkgs     Tue Jul 23 06:59:51 2002 +0000
+++ b/distrib/sets/listpkgs     Tue Jul 23 09:02:45 2002 +0000
@@ -1,14 +1,14 @@
 #!/bin/sh
 #
-# $NetBSD: listpkgs,v 1.3 2002/03/24 22:15:28 bjh21 Exp $
+# $NetBSD: listpkgs,v 1.4 2002/07/23 09:02:45 lukem Exp $
 #
 # List all packages in the given pkgset by parsing the list files.
 #
 
 # set defaults
-: ${MAKE=make}
-machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
-arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
+MAKE="${MAKE:-make} -j 1"
+machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | ${MAKE} -s -f-`}
+arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | ${MAKE} -s -f-`}
 setd=`dirname $0`
 prefix=/
 
diff -r d52dd3a9c550 -r 9accc8f75571 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Tue Jul 23 06:59:51 2002 +0000
+++ b/distrib/sets/makeflist    Tue Jul 23 09:02:45 2002 +0000
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.48 2002/07/17 23:34:20 fredette Exp $
+# $NetBSD: makeflist,v 1.49 2002/07/23 09:02:45 lukem Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
 #
 
 # set defaults
-: ${MAKE=make}
+MAKE="${MAKE:-make} -j 1"
 machine=`${MAKE} print_machine`
 machine_arch=`${MAKE} print_machine_arch`
 machine_cpu=`${MAKE} print_machine_cpu`
diff -r d52dd3a9c550 -r 9accc8f75571 distrib/sets/makeobsolete
--- a/distrib/sets/makeobsolete Tue Jul 23 06:59:51 2002 +0000
+++ b/distrib/sets/makeobsolete Tue Jul 23 09:02:45 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.10 2002/04/09 06:07:17 tron Exp $
+# $NetBSD: makeobsolete,v 1.11 2002/07/23 09:02:45 lukem Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -8,9 +8,9 @@
 #
 
 # set defaults
-: ${MAKE=make}
-machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
-arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
+MAKE="${MAKE:-make} -j 1"
+machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | ${MAKE} -s -f-`}
+arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | ${MAKE} -s -f-`}
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
diff -r d52dd3a9c550 -r 9accc8f75571 distrib/sets/makeplist
--- a/distrib/sets/makeplist    Tue Jul 23 06:59:51 2002 +0000
+++ b/distrib/sets/makeplist    Tue Jul 23 09:02:45 2002 +0000
@@ -5,9 +5,9 @@
 #
 
 # set defaults
-: ${MAKE=make}
-machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
-arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
+MAKE="${MAKE:-make} -j 1"
+machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | ${MAKE} -s -f-`}
+arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | ${MAKE} -s -f-`}
 setd=`dirname $0`
 prefix=/
 
diff -r d52dd3a9c550 -r 9accc8f75571 distrib/sets/makesums
--- a/distrib/sets/makesums     Tue Jul 23 06:59:51 2002 +0000
+++ b/distrib/sets/makesums     Tue Jul 23 09:02:45 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makesums,v 1.3 2002/03/31 15:17:58 bjh21 Exp $
+# $NetBSD: makesums,v 1.4 2002/07/23 09:02:45 lukem Exp $
 #
 # Make checksum files for files in ``tardir''.  Usage:
 # makesums [-t tardir] [ -all ] [setname ...]
@@ -19,7 +19,6 @@
 
 # set defaults
 : ${CKSUM=cksum}
-: ${MAKE=make} # XXX: what purpose does this serve??
 tars=$RELEASEDIR
 dash_all=no
 
diff -r d52dd3a9c550 -r 9accc8f75571 distrib/sets/maketars
--- a/distrib/sets/maketars     Tue Jul 23 06:59:51 2002 +0000
+++ b/distrib/sets/maketars     Tue Jul 23 09:02:45 2002 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.24 2002/05/19 13:24:22 lukem Exp $
+# $NetBSD: maketars,v 1.25 2002/07/23 09:02:46 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-a arch] [-m machine] [-s setsdir]
@@ -8,9 +8,9 @@
 #
 
 # set defaults
-: ${MAKE=make}
 : ${PAX=pax}
 : ${MTREE=mtree}
+MAKE="${MAKE:-make} -j 1"
 
 machine=`${MAKE} print_machine`
 machine_arch=`${MAKE} print_machine_arch`



Home | Main Index | Thread Index | Old Index