On Mon, Nov 18, 2013 at 08:48:13PM -0500, Peter Eisentraut wrote:
> On Tue, 2013-11-05 at 18:29 +0200, Oskari Saarenmaa wrote:
> > This can be used to tag custom built packages with an extra version string
> > such as the git describe id or distribution package release version.
>
> I think this is a reasonable feature, and the implementation is OK, but
> I don't see why the format of the extra version information needs to be
> exactly
>
> PG_VERSION="$PACKAGE_VERSION ($withval)"
>
> I'd imagine, for example, that someone will want to do -something or
> +something. So I'd just make this
>
> PG_VERSION="$PACKAGE_VERSION$withval"
>
> Comments?
Sounds reasonable.
> > +# Allow adding a custom string to PG_VERSION
> > +PGAC_ARG_REQ(with, extra-version, [NAME], [extra version information],
> > +[PG_VERSION="$PACKAGE_VERSION ($withval)"],
> > [PG_VERSION="$PACKAGE_VERSION"])
>
> This could be indented better. It was a bit confusing at first.
Agreed. Attached an updated patch, or you can grab it from
https://github.com/saaros/postgres/compare/extra-version
Thanks,
Oskari
>From 00ca6c31db06edee0a6b5b5417eac71c274d7876 Mon Sep 17 00:00:00 2001
From: Oskari Saarenmaa <o...@ohmu.fi>
Date: Wed, 20 Nov 2013 01:01:58 +0200
Subject: [PATCH] configure: allow adding a custom string to PG_VERSION
This can be used to tag custom built packages with an extra version string
such as the git describe id or distribution package release version.
Signed-off-by: Oskari Saarenmaa <o...@ohmu.fi>
---
configure.in | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
index 304399e..1f2f135 100644
--- a/configure.in
+++ b/configure.in
@@ -29,11 +29,16 @@ AC_CONFIG_AUX_DIR(config)
AC_PREFIX_DEFAULT(/usr/local/pgsql)
AC_SUBST(configure_args, [$ac_configure_args])
-AC_DEFINE_UNQUOTED(PG_VERSION, "$PACKAGE_VERSION", [PostgreSQL version as a
string])
[PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`]
AC_SUBST(PG_MAJORVERSION)
AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major
version as a string])
+# Allow adding a custom string to PG_VERSION
+PGAC_ARG_REQ(with, extra-version, [NAME], [extra version information],
+ [PG_VERSION="$PACKAGE_VERSION$withval"],
+ [PG_VERSION="$PACKAGE_VERSION"])
+AC_DEFINE_UNQUOTED(PG_VERSION, "$PG_VERSION", [PostgreSQL version as a string])
+
AC_CANONICAL_HOST
template=
@@ -1920,7 +1925,7 @@ else
fi
AC_DEFINE_UNQUOTED(PG_VERSION_STR,
- ["PostgreSQL $PACKAGE_VERSION on $host, compiled by
$cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
+ ["PostgreSQL $PG_VERSION on $host, compiled by $cc_string,
`expr $ac_cv_sizeof_void_p \* 8`-bit"],
[A string containing the version number, platform, and C
compiler])
# Supply a numeric version string for use by 3rd party add-ons
--
1.8.4.2
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
