Re: pgsql: Remove win32ver.rc from version_stamp.pl
От | Tom Lane |
---|---|
Тема | Re: pgsql: Remove win32ver.rc from version_stamp.pl |
Дата | |
Msg-id | 24807.1583852820@sss.pgh.pa.us обсуждение исходный текст |
Ответ на | Re: pgsql: Remove win32ver.rc from version_stamp.pl (Tom Lane <tgl@sss.pgh.pa.us>) |
Список | pgsql-committers |
I wrote: > I'd suggest reverting the change in how PG_VERSION_NUM is computed > in configure.in --- that was certainly not necessary to the patch, > and evidently you're falling foul of some weird behavior around > nesting double-quotes and backquotes. Actually, you can just get rid of the nesting, because there's no need to be picky about what white-space gets fed to awk. The attached seems to be enough to fix it (tested on gaur). regards, tom lane diff --git a/configure b/configure index d6d3f26..1a0aca9 100755 --- a/configure +++ b/configure @@ -18887,7 +18887,7 @@ _ACEOF # Supply a numeric version string for use by 3rd party add-ons # awk -F is a regex on some platforms, and not on others, so make "." a tab -PG_VERSION_NUM="`echo "$PG_MAJORVERSION $PG_MINORVERSION" | +PG_VERSION_NUM="`echo $PG_MAJORVERSION $PG_MINORVERSION | $AWK '{printf "%d%04d", $1, $2}'`" cat >>confdefs.h <<_ACEOF diff --git a/configure.in b/configure.in index 78902fb..b27708e 100644 --- a/configure.in +++ b/configure.in @@ -2322,7 +2322,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR, # Supply a numeric version string for use by 3rd party add-ons # awk -F is a regex on some platforms, and not on others, so make "." a tab -[PG_VERSION_NUM="`echo "$PG_MAJORVERSION $PG_MINORVERSION" | +[PG_VERSION_NUM="`echo $PG_MAJORVERSION $PG_MINORVERSION | $AWK '{printf "%d%04d", $1, $2}'`"] AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number]) AC_SUBST(PG_VERSION_NUM)
В списке pgsql-committers по дате отправления: