1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make numeric form of PG version number readily available in Makefiles.

Browse Source 
Expose PG_VERSION_NUM (e.g., "90600") as a Make variable; but for
consistency with the other Make variables holding similar info,
call the variable just VERSION_NUM not PG_VERSION_NUM.

There was some discussion of making this value available as a pg_config
value as well.  However, that would entail substantially more work than
this two-line patch.  Given that there was not exactly universal consensus
that we need this at all, let's just do a minimal amount of work for now.

Back-patch of commit a5d489ccb7e613c7ca3be6141092b8c1d2c13fa7, so that this
variable is actually useful for its intended purpose sometime before 2020.

Michael Paquier, reviewed by Pavel Stehule
This commit is contained in:
Tom Lane 2015-07-05 12:01:02 -04:00
parent fdfe0b1cd9
commit 29ff43adfb
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -642,6 +642,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS ac_subst_vars='LTLIBOBJS
vpath_build vpath_build
PG_VERSION_NUM
OSX OSX
XSLTPROC XSLTPROC
COLLATEINDEX COLLATEINDEX
@ -29407,6 +29408,7 @@ _ACEOF
# prepare build tree if outside source tree # prepare build tree if outside source tree
# Note 1: test -ef might not exist, but it's more reliable than `pwd`. # Note 1: test -ef might not exist, but it's more reliable than `pwd`.
# Note 2: /bin/pwd might be better than shell's built-in at getting # Note 2: /bin/pwd might be better than shell's built-in at getting

1
configure.in
View File

@ -1869,6 +1869,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
tr '.' ' ' | tr '.' ' ' |
$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"] $AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"]
AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number]) AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
AC_SUBST(PG_VERSION_NUM)
# prepare build tree if outside source tree # prepare build tree if outside source tree

1
src/Makefile.global.in
View File

@ -30,6 +30,7 @@ all:
# PostgreSQL version number # PostgreSQL version number
VERSION = @PACKAGE_VERSION@ VERSION = @PACKAGE_VERSION@
MAJORVERSION = @PG_MAJORVERSION@ MAJORVERSION = @PG_MAJORVERSION@
VERSION_NUM = @PG_VERSION_NUM@
# Support for VPATH builds # Support for VPATH builds
vpath_build = @vpath_build@ vpath_build = @vpath_build@