Skip to content

Commit bcf2360

Browse files
committed
Add MODULE_COMPAT_SUFFIX variable
This allows us to easily distinguish packages built against normal PostgreSQL server and modular PostgreSQL server. * configure.ac (MODULE_COMPAT_SUFFIX): New option. * lib/rpm/macros.d/macros.in: Use @MODULE_COMPAT_SUFFIX@.
1 parent c9f3bd3 commit bcf2360

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ New in 8.3 version:
55
* postgresql-setup creates correct 'log_directory' based on PG version
66
(the default changed from $datadir/pg_log to $datadir/log in v10).
77

8+
* Modular PostgreSQL builds can provide/depend on
9+
postgresql-server(:MODULE_COMPAT_11<some_suffix>) instead of
10+
postgresql-server(:MODULE_COMPAT_11) to avoid clash with non-modular
11+
builds.
12+
813
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
914

1015
New in 8.2 version:

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ AC_ARG_WITH([libs-pkg],
170170
[], [withval=yes])
171171
_AX_TEXT_TPL_SUBST([LIBS_ENABLED], [$withval])
172172

173+
PGSETUP_SUBST_OPT([MODULE_COMPAT_SUFFIX], [],
174+
[add suffix to module provides in %postgresql_module_requires])
173175
PGSETUP_SUBST_OPT([NAME_SRV_PFX], [],
174176
[service name prefix, like (PFX)postgresql.service])
175177
PGSETUP_SUBST_OPT([NAME_SRV_SFX], [],

lib/rpm/macros.d/macros.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
%@NAME_SERVICE_VARNAME@_major @PGMAJORVERSION@
88

9-
%@NAME_SERVICE_VARNAME@_module_requires Requires: @NAME_SERVICE_VARNAME@-server(:MODULE_COMPAT_@PGMAJORVERSION@)
9+
%@NAME_SERVICE_VARNAME@_module_requires Requires: @NAME_SERVICE_VARNAME@-server(:MODULE_COMPAT_@PGMAJORVERSION@@MODULE_COMPAT_SUFFIX@)

0 commit comments

Comments
 (0)