database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-03 01:21:48 +03:00
Code

Don't define FRONTEND for initdb

Browse Source 
No headers requiring FRONTED to be defined are included as of af1a949109d.

Since this is the last user of (contrib|frontend)_defines in Mkvcbuild.pm,
remove them.

Discussion: https://postgr.es/m/20220820194550.725755r6fj2ro3rx@awork3.anarazel.de
This commit is contained in:
Andres Freund 2022-08-22 20:39:30 -07:00
parent 1bdd54e662
commit 06e3559bad
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/initdb/Makefile
View File

@ -16,7 +16,7 @@ subdir = src/bin/initdb
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS) override CPPFLAGS := -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS)
# Note: it's important that we link to encnames.o from libpgcommon, not # Note: it's important that we link to encnames.o from libpgcommon, not
# from libpq, else we have risks of version skew if we run with a libpq # from libpq, else we have risks of version skew if we run with a libpq

26
src/tools/msvc/Mkvcbuild.pm
View File

@ -35,7 +35,6 @@ my $libpq;
my @unlink_on_exit; my @unlink_on_exit;
# Set of variables for modules in contrib/ and src/test/modules/ # Set of variables for modules in contrib/ and src/test/modules/
my $contrib_defines = {};
my @contrib_uselibpq = (); my @contrib_uselibpq = ();
my @contrib_uselibpgport = (); my @contrib_uselibpgport = ();
my @contrib_uselibpgcommon = (); my @contrib_uselibpgcommon = ();
@ -53,7 +52,6 @@ my @contrib_excludes = (
'unsafe_tests'); 'unsafe_tests');
# Set of variables for frontend modules # Set of variables for frontend modules
my $frontend_defines = { 'initdb' => 'FRONTEND' };
my @frontend_uselibpq = my @frontend_uselibpq =
('pg_amcheck', 'pg_ctl', 'pg_upgrade', 'pgbench', 'psql', 'initdb'); ('pg_amcheck', 'pg_ctl', 'pg_upgrade', 'pgbench', 'psql', 'initdb');
my @frontend_uselibpgport = ( my @frontend_uselibpgport = (
@ -1126,10 +1124,10 @@ sub AdjustContribProj
{ {
my $proj = shift; my $proj = shift;
AdjustModule( AdjustModule(
$proj, $contrib_defines, $proj, \@contrib_uselibpq,
\@contrib_uselibpq, \@contrib_uselibpgport, \@contrib_uselibpgport, \@contrib_uselibpgcommon,
\@contrib_uselibpgcommon, $contrib_extralibs, $contrib_extralibs, $contrib_extrasource,
$contrib_extrasource, $contrib_extraincludes); $contrib_extraincludes);
return; return;
} }
@ -1137,17 +1135,16 @@ sub AdjustFrontendProj
{ {
my $proj = shift; my $proj = shift;
AdjustModule( AdjustModule(
$proj, $frontend_defines, $proj, \@frontend_uselibpq,
\@frontend_uselibpq, \@frontend_uselibpgport, \@frontend_uselibpgport, \@frontend_uselibpgcommon,
\@frontend_uselibpgcommon, $frontend_extralibs, $frontend_extralibs, $frontend_extrasource,
$frontend_extrasource, $frontend_extraincludes); $frontend_extraincludes);
return; return;
} }
sub AdjustModule sub AdjustModule
{ {
my $proj = shift; my $proj = shift;
my $module_defines = shift;
my $module_uselibpq = shift; my $module_uselibpq = shift;
my $module_uselibpgport = shift; my $module_uselibpgport = shift;
my $module_uselibpgcommon = shift; my $module_uselibpgcommon = shift;
@ -1156,13 +1153,6 @@ sub AdjustModule
my $module_extraincludes = shift; my $module_extraincludes = shift;
my $n = $proj->{name}; my $n = $proj->{name};
if ($module_defines->{$n})
{
foreach my $d ($module_defines->{$n})
{
$proj->AddDefine($d);
}
}
if (grep { /^$n$/ } @{$module_uselibpq}) if (grep { /^$n$/ } @{$module_uselibpq})
{ {
$proj->AddIncludeDir('src\interfaces\libpq'); $proj->AddIncludeDir('src\interfaces\libpq');