[src/trunk]: src/distrib/sets Fix sets handling so that GCC specific lists ar...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c750fcde314a
branches:  trunk
changeset: 552215:c750fcde314a
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Sep 21 19:26:02 2003 +0000

description:
Fix sets handling so that GCC specific lists are really used.

diffstat:

 distrib/sets/Makefile     |  5 ++++-
 distrib/sets/makeflist    |  6 +++++-
 distrib/sets/makeobsolete |  6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diffs (70 lines):

diff -r 435a3c8c59a9 -r c750fcde314a distrib/sets/Makefile
--- a/distrib/sets/Makefile     Sun Sep 21 19:20:18 2003 +0000
+++ b/distrib/sets/Makefile     Sun Sep 21 19:26:02 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 2003/08/04 05:53:20 mrg Exp $
+#      $NetBSD: Makefile,v 1.30 2003/09/21 19:26:02 tron Exp $
 
 # The `all' target must appear before bsd.own.mk is pulled in.
 all:
@@ -13,6 +13,9 @@
                CKSUM=${TOOL_CKSUM:Q} MAKE=${MAKE:Q} MTREE=${TOOL_MTREE:Q} \
                PAX=${TOOL_PAX:Q} 
 
+print_have_gcc3:
+       @echo ${HAVE_GCC3}
+
 print_machine: .PHONY
        @echo ${MACHINE}
 
diff -r 435a3c8c59a9 -r c750fcde314a distrib/sets/makeflist
--- a/distrib/sets/makeflist    Sun Sep 21 19:20:18 2003 +0000
+++ b/distrib/sets/makeflist    Sun Sep 21 19:26:02 2003 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.62 2003/08/04 05:53:20 mrg Exp $
+# $NetBSD: makeflist,v 1.63 2003/09/21 19:26:03 tron Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -17,6 +17,10 @@
 x11_version=`${make} print_x11_version`
 setd=`pwd`
 nlists="base comp etc games man misc text"
+if [ "`${make} print_have_gcc3`" != yes ]
+then
+       nlists="$nlists gcc"
+fi
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
 lists=$nlists
 
diff -r 435a3c8c59a9 -r c750fcde314a distrib/sets/makeobsolete
--- a/distrib/sets/makeobsolete Sun Sep 21 19:20:18 2003 +0000
+++ b/distrib/sets/makeobsolete Sun Sep 21 19:26:02 2003 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.17 2003/02/20 11:40:29 lukem Exp $
+# $NetBSD: makeobsolete,v 1.18 2003/09/21 19:26:05 tron Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -16,6 +16,7 @@
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
 lists=$nlists
 target=./dist
+have_gcc3="`${make} print_have_gcc3`"
 
 # handle args
 while : ; do
@@ -98,6 +99,9 @@
        if [ -f $setd/lists/$setname/obsolete.${machine} ]; then
                awk -- '{print $1}' $setd/lists/$setname/obsolete.${machine}
        fi
+       if [ "$have_gcc3" = yes -a -f $setd/lists/$setname/obsolete.gcc ]; then
+               awk -- '{print $1}' $setd/lists/$setname/obsolete.gcc
+       fi
        ) | egrep -v '^#' | sort -ru > $file
        if [ ! -s $file ] ; then
                rm $file