1From b92eebe8b0760fee7bd55c6c22318620c2c07579 Mon Sep 17 00:00:00 2001 2From: Mingli Yu <mingli.yu@windriver.com> 3Date: Mon, 1 Aug 2022 15:44:38 +0800 4Subject: [PATCH] config_info.c: not expose build info 5 6Don't collect the build information to fix the buildpaths issue. 7 8Upstream-Status: Inappropriate [oe specific] 9 10Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 11--- 12 configure.ac | 2 +- 13 src/common/config_info.c | 68 ---------------------------------------- 14 2 files changed, 1 insertion(+), 69 deletions(-) 15 16diff --git a/configure.ac b/configure.ac 17index 0eb595b..508487b 100644 18--- a/configure.ac 19+++ b/configure.ac 20@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) 21 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) 22 AC_CONFIG_AUX_DIR(config) 23 AC_PREFIX_DEFAULT(/usr/local/pgsql) 24-AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure]) 25+AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["ac_configure_args"], [Saved arguments from configure]) 26 27 [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] 28 [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`] 29diff --git a/src/common/config_info.c b/src/common/config_info.c 30index e72e729..b482c20 100644 31--- a/src/common/config_info.c 32+++ b/src/common/config_info.c 33@@ -38,7 +38,7 @@ 34 int i = 0; 35 36 /* Adjust this to match the number of items filled below */ 37- *configdata_len = 23; 38+ *configdata_len = 14; 39 configdata = (ConfigData *) palloc(*configdata_len * sizeof(ConfigData)); 40 41 configdata[i].name = pstrdup("BINDIR"); 42@@ -123,74 +123,6 @@ 43 configdata[i].setting = pstrdup(path); 44 i++; 45 46- configdata[i].name = pstrdup("CONFIGURE"); 47- configdata[i].setting = pstrdup(CONFIGURE_ARGS); 48- i++; 49- 50- configdata[i].name = pstrdup("CC"); 51-#ifdef VAL_CC 52- configdata[i].setting = pstrdup(VAL_CC); 53-#else 54- configdata[i].setting = pstrdup(_("not recorded")); 55-#endif 56- i++; 57- 58- configdata[i].name = pstrdup("CPPFLAGS"); 59-#ifdef VAL_CPPFLAGS 60- configdata[i].setting = pstrdup(VAL_CPPFLAGS); 61-#else 62- configdata[i].setting = pstrdup(_("not recorded")); 63-#endif 64- i++; 65- 66- configdata[i].name = pstrdup("CFLAGS"); 67-#ifdef VAL_CFLAGS 68- configdata[i].setting = pstrdup(VAL_CFLAGS); 69-#else 70- configdata[i].setting = pstrdup(_("not recorded")); 71-#endif 72- i++; 73- 74- configdata[i].name = pstrdup("CFLAGS_SL"); 75-#ifdef VAL_CFLAGS_SL 76- configdata[i].setting = pstrdup(VAL_CFLAGS_SL); 77-#else 78- configdata[i].setting = pstrdup(_("not recorded")); 79-#endif 80- i++; 81- 82- configdata[i].name = pstrdup("LDFLAGS"); 83-#ifdef VAL_LDFLAGS 84- configdata[i].setting = pstrdup(VAL_LDFLAGS); 85-#else 86- configdata[i].setting = pstrdup(_("not recorded")); 87-#endif 88- i++; 89- 90- configdata[i].name = pstrdup("LDFLAGS_EX"); 91-#ifdef VAL_LDFLAGS_EX 92- configdata[i].setting = pstrdup(VAL_LDFLAGS_EX); 93-#else 94- configdata[i].setting = pstrdup(_("not recorded")); 95-#endif 96- i++; 97- 98- configdata[i].name = pstrdup("LDFLAGS_SL"); 99-#ifdef VAL_LDFLAGS_SL 100- configdata[i].setting = pstrdup(VAL_LDFLAGS_SL); 101-#else 102- configdata[i].setting = pstrdup(_("not recorded")); 103-#endif 104- i++; 105- 106- configdata[i].name = pstrdup("LIBS"); 107-#ifdef VAL_LIBS 108- configdata[i].setting = pstrdup(VAL_LIBS); 109-#else 110- configdata[i].setting = pstrdup(_("not recorded")); 111-#endif 112- i++; 113- 114 configdata[i].name = pstrdup("VERSION"); 115 configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION); 116 i++; 117-- 1182.25.1 119 120