From 272fcb423a79b5b8bb4a80679b6b48feca66ebca Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 9 Aug 2021 15:50:10 +0000
Subject: [PATCH] 8272113: Build compare script fails with differences in
 classlist

Reviewed-by: tschatzl, hseigel
---
 make/scripts/compare.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh
index 42886573f2c..c7215058b50 100644
--- a/make/scripts/compare.sh
+++ b/make/scripts/compare.sh
@@ -362,8 +362,14 @@ compare_general_files() {
                 THIS_FILE=$WORK_DIR/$f.this
                 $MKDIR -p $(dirname $OTHER_FILE) $(dirname $THIS_FILE)
                 $RM $OTHER_FILE $THIS_FILE
-                $CAT $OTHER_DIR/$f | $SORT > $OTHER_FILE
-                $CAT $THIS_DIR/$f  | $SORT > $THIS_FILE
+                # Also filter out the "id: NNNN" in the classlists
+                if [[ "$f" = *"/lib/classlist" ]]; then
+                    $CAT $OTHER_DIR/$f | $SORT | $SED "s| id: .*||g" > $OTHER_FILE
+                    $CAT $THIS_DIR/$f  | $SORT | $SED "s| id: .*||g" > $THIS_FILE
+                else
+                    $CAT $OTHER_DIR/$f | $SORT > $OTHER_FILE
+                    $CAT $THIS_DIR/$f  | $SORT > $THIS_FILE
+                fi
             else
                 OTHER_FILE=$OTHER_DIR/$f
                 THIS_FILE=$THIS_DIR/$f