[src/trunk]: src/distrib/sets Handle compatdir first whether making obsolete ...

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

details:   https://anonhg.NetBSD.org/src/rev/ad8085d999b0
branches:  trunk
changeset: 321977:ad8085d999b0
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Thu Apr 12 11:49:04 2018 +0000

description:
Handle compatdir first whether making obsolete lists or not, to
make obsolete lists including compat directory (eg. ./usr/lib/i386)
properly.

diffstat:

 distrib/sets/sets.subr |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r e2b4021d1402 -r ad8085d999b0 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Thu Apr 12 10:30:24 2018 +0000
+++ b/distrib/sets/sets.subr    Thu Apr 12 11:49:04 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.183 2018/02/08 03:27:50 christos Exp $
+#      $NetBSD: sets.subr,v 1.184 2018/04/12 11:49:04 nakayama Exp $
 #
 
 #
@@ -180,7 +180,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.183 2018/02/08 03:27:50 christos Exp $
+#      # $NetBSD: sets.subr,v 1.184 2018/04/12 11:49:04 nakayama Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -369,6 +369,13 @@
                                if (kw == "obsolete")
                                        haveobs = 1
                        }
+                       if (iscompatdir) {
+                               for (d in cpaths) {
+                                       if (cpaths[d] == $1 "/")
+                                               next
+                               }
+                               cpaths[ncpaths++] = $1 "/"
+                       }
                        if (obsolete && ! haveobs)
                                next
                        if (!show)
@@ -392,11 +399,6 @@
                                emitcompat[$1] = 1;
                                next
                        }
-                       for (d in cpaths) {
-                               if (cpaths[d] == $1 "/")
-                                       next
-                       }
-                       cpaths[ncpaths++] = $1 "/"
                        for (d in compatarchdirs) {
                                tmp = $0
                                xfile = $1 "/" compatarchdirs[d]