| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From b92eebe8b0760fee7bd55c6c22318620c2c07579 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Mon, 1 Aug 2022 15:44:38 +0800 |
| 4 | Subject: [PATCH] config_info.c: not expose build info |
| 5 | |
| 6 | Don't collect the build information to fix the buildpaths issue. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [oe specific] |
| 9 | |
| 10 | Signed-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 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index 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]*\)'`] |
| 29 | diff --git a/src/common/config_info.c b/src/common/config_info.c |
| 30 | index e72e729..b482c20 100644 |
| 31 | --- a/src/common/config_info.c |
| 32 | +++ b/src/common/config_info.c |
| 33 | @@ -123,74 +123,6 @@ get_configdata(const char *my_exec_path, size_t *configdata_len) |
| 34 | configdata[i].setting = pstrdup(path); |
| 35 | i++; |
| 36 | |
| 37 | - configdata[i].name = pstrdup("CONFIGURE"); |
| 38 | - configdata[i].setting = pstrdup(CONFIGURE_ARGS); |
| 39 | - i++; |
| 40 | - |
| 41 | - configdata[i].name = pstrdup("CC"); |
| 42 | -#ifdef VAL_CC |
| 43 | - configdata[i].setting = pstrdup(VAL_CC); |
| 44 | -#else |
| 45 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 46 | -#endif |
| 47 | - i++; |
| 48 | - |
| 49 | - configdata[i].name = pstrdup("CPPFLAGS"); |
| 50 | -#ifdef VAL_CPPFLAGS |
| 51 | - configdata[i].setting = pstrdup(VAL_CPPFLAGS); |
| 52 | -#else |
| 53 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 54 | -#endif |
| 55 | - i++; |
| 56 | - |
| 57 | - configdata[i].name = pstrdup("CFLAGS"); |
| 58 | -#ifdef VAL_CFLAGS |
| 59 | - configdata[i].setting = pstrdup(VAL_CFLAGS); |
| 60 | -#else |
| 61 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 62 | -#endif |
| 63 | - i++; |
| 64 | - |
| 65 | - configdata[i].name = pstrdup("CFLAGS_SL"); |
| 66 | -#ifdef VAL_CFLAGS_SL |
| 67 | - configdata[i].setting = pstrdup(VAL_CFLAGS_SL); |
| 68 | -#else |
| 69 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 70 | -#endif |
| 71 | - i++; |
| 72 | - |
| 73 | - configdata[i].name = pstrdup("LDFLAGS"); |
| 74 | -#ifdef VAL_LDFLAGS |
| 75 | - configdata[i].setting = pstrdup(VAL_LDFLAGS); |
| 76 | -#else |
| 77 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 78 | -#endif |
| 79 | - i++; |
| 80 | - |
| 81 | - configdata[i].name = pstrdup("LDFLAGS_EX"); |
| 82 | -#ifdef VAL_LDFLAGS_EX |
| 83 | - configdata[i].setting = pstrdup(VAL_LDFLAGS_EX); |
| 84 | -#else |
| 85 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 86 | -#endif |
| 87 | - i++; |
| 88 | - |
| 89 | - configdata[i].name = pstrdup("LDFLAGS_SL"); |
| 90 | -#ifdef VAL_LDFLAGS_SL |
| 91 | - configdata[i].setting = pstrdup(VAL_LDFLAGS_SL); |
| 92 | -#else |
| 93 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 94 | -#endif |
| 95 | - i++; |
| 96 | - |
| 97 | - configdata[i].name = pstrdup("LIBS"); |
| 98 | -#ifdef VAL_LIBS |
| 99 | - configdata[i].setting = pstrdup(VAL_LIBS); |
| 100 | -#else |
| 101 | - configdata[i].setting = pstrdup(_("not recorded")); |
| 102 | -#endif |
| 103 | - i++; |
| 104 | - |
| 105 | configdata[i].name = pstrdup("VERSION"); |
| 106 | configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION); |
| 107 | i++; |
| 108 | -- |
| 109 | 2.25.1 |
| 110 | |