fix for SQL*PLUS meson build failed

jiaoshuntian · jiaoshuntian · commit a10c3931d3af · 2025-05-21T08:45:43.000+08:00
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
@@ -44,6 +44,7 @@ OBJS = \
 	startup.o \
 	stringutils.o \
 	tab-complete.o \
+	psqlplusscan.o \
 	variables.o
 
 
@@ -52,6 +53,13 @@ all: psql
 psql: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
+# See notes in src/backend/parser/Makefile about the following two rules
+psqlplusparse.h: psqlplusparse.c
+	touch $@
+psqlplusparse.c: BISONFLAGS += -d
+# Force these dependencies to be known even without dependency info built:
+psqlplusparse.o psqlplusscan.o: psqlplusparse.h
+
 help.o: sql_help.h
 
 # ReqID:SRS-CMD-PSQL
diff --git a/src/bin/psql/meson.build b/src/bin/psql/meson.build
@@ -32,6 +32,19 @@ ora_psqlscanslash = custom_target('ora_psqlscanslash',
 generated_sources += ora_psqlscanslash
 psql_sources += ora_psqlscanslash
 
+psqlplusscan = custom_target('psqlplusscan',
+  input: 'psqlplusscan.l',
+  output: 'psqlplusscan.c',
+  command: [flex_cmd, '--no-backup', '--fix-warnings', '--', '-Cfe', '-p', '-p'])
+generated_sources += psqlplusscan
+psql_sources += psqlplusscan
+psqlplusparse = custom_target('psqlplusparse',
+  input: 'psqlplusparse.y',
+  kwargs: bison_kw,
+)
+generated_sources += psqlplusparse.to_list()
+psql_sources += psqlplusparse
+
 sql_help = custom_target('psql_help',
   output: ['sql_help.c', 'sql_help.h'],
   depfile: 'sql_help.dep',
diff --git a/src/bin/psql/psqlplusparse.y b/src/bin/psql/psqlplusparse.y
@@ -542,4 +542,3 @@ merge_print_list(print_list *list1, print_list *list2)
 /* ... and the yylval macro, which flex will have its own definition for */
 #undef yylval
 
-#include "psqlplusscan.c"
diff --git a/src/bin/psql/psqlplusscan.l b/src/bin/psql/psqlplusscan.l
@@ -17,10 +17,12 @@
  *-------------------------------------------------------------------------
  */
 
+#include "postgres_fe.h"
 #include "common/string.h"
 #include "fe_utils/psqlscan_int.h"
 #include "libpq-fe.h"
 #include "psqlplus.h"
+#include "psqlplusparse.h"
 
 /* LCOV_EXCL_START */
 
@@ -573,4 +575,4 @@ litbufdup(char *prefix, yyscan_t yyscanner)
 	memcpy(new + plen, state->literalbuf, llen);
 	new[llen + plen] = '\0';
 	return new;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -542,4 +542,3 @@ merge_print_list(print_list list1, print_list list2)`
`542`	`542`	`/* ... and the yylval macro, which flex will have its own definition for */`
`543`	`543`	`#undef yylval`
`544`	`544`
`545`		`-#include "psqlplusscan.c"`