bzr commit into MySQL Storage Engine API team tree:mysql-5.1-sea branch (v.narayanan:2675) WL#4380

[Narayanan V]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-5.1-sea

 2675 Narayanan V	2008-08-06
      WL#4380
      
      Fix build failure in the solaris sparc platform.
      This is caused by a failure introduced by the
      abi_check rule.
modified:
  Makefile.am

per-file messages:
  Makefile.am
    Add a filter to sed in the do_abi_check rule
    to remove a line introduced by the preprocessor
    in the solaris sparc platform.
=== modified file 'Makefile.am'
--- a/Makefile.am	2008-07-23 06:33:27 +0000
+++ b/Makefile.am	2008-08-06 06:27:14 +0000
@@ -261,10 +261,10 @@ TEST_PREPROCESSOR_HEADER = $(top_srcdir)
 #    2.1) remove blank lines and lines that begin with "# "
 #         (The header information is retained to enable easy
 #         analysis of abi diffs at a later stage).
-#    2.2) When gcc -E is run in the Mac OS it introduces a line of output 
-#         that results in showing up as a difference between the .pp and 
-#         .out files. Remove this OS specific preprocessor text inserted by
-#         the preprocessor in the MAC OS. 
+#    2.2) When gcc -E is run on the Mac OS  and solaris sparc platforms it
+#         introduces a line of output that shows up as a difference between
+#         the .pp and .out files. Remove these OS specific preprocessor text
+#         inserted by the preprocessor.
 # 3) diff the generated file and the canons (.pp files already in
 #    the repository).
 # 4) delete the .out file that is generated.
@@ -304,7 +304,8 @@ do_abi_check:
 	                                 $$file 2>/dev/null | \
 	                  @SED@ -e '/^# /d' \
 	                            -e '/^[ 	]*$$/d' \
-	                            -e '/^#pragma GCC set_debug_pwd/d' > \
+	                            -e '/^#pragma GCC set_debug_pwd/d' \
+	                            -e '/^#ident/d' > \
 	                                       $(top_builddir)/abi_check.out; \
 	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
 	                  @RM@ $(top_builddir)/abi_check.out; \