diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-07-19 04:01:29 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-07-19 04:01:29 +0000 |
| commit | 4b362c662e35c0edd6ed66523f94ebfe9f466329 (patch) | |
| tree | f6afb196f699504ab970e2102645dcf49def8f10 /src/tools | |
| parent | a1c692358bb9958b7cb67e4284aae6aa3aabf714 (diff) | |
Avoid substituting NAMEDATALEN, FLOAT4PASSBYVAL, and FLOAT8PASSBYVAL into
the postgres.bki file during build, because we want that file to be entirely
platform- and configuration-independent; else it can't safely be put into
/usr/share on multiarch machines. We can do the substitution during initdb,
instead. FLOAT4PASSBYVAL and FLOAT8PASSBYVAL are new breakage as of 8.4,
while the NAMEDATALEN hazard has been there all along but I guess no one
tripped over it. Noticed while trying to build "universal" OS X binaries.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/msvc/Genbki.pm | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/tools/msvc/Genbki.pm b/src/tools/msvc/Genbki.pm index d8fe3027961..f8a7294c7db 100644 --- a/src/tools/msvc/Genbki.pm +++ b/src/tools/msvc/Genbki.pm @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/tools/msvc/Genbki.pm,v 1.4 2008/04/21 00:26:47 tgl Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/Genbki.pm,v 1.5 2008/07/19 04:01:29 tgl Exp $ # #------------------------------------------------------------------------- @@ -33,19 +33,6 @@ sub genbki $version =~ /^(\d+\.\d+)/ || die "Bad format verison $version\n"; my $majorversion = $1; - my $pgext = read_file("src/include/pg_config_manual.h"); - $pgext =~ /^#define\s+NAMEDATALEN\s+(\d+)$/mg - || die "Could not read NAMEDATALEN from pg_config_manual.h\n"; - my $namedatalen = $1; - - my $pgconf = read_file("src/include/pg_config.h"); - $pgconf =~ /^#define\s+FLOAT4PASSBYVAL\s+(\w+)$/mg - || die "Could not read FLOAT4PASSBYVAL from pg_config.h\n"; - my $float4passbyval = $1; - $pgconf =~ /^#define\s+FLOAT8PASSBYVAL\s+(\w+)$/mg - || die "Could not read FLOAT8PASSBYVAL from pg_config.h\n"; - my $float8passbyval = $1; - my $pgauthid = read_file("src/include/catalog/pg_authid.h"); $pgauthid =~ /^#define\s+BOOTSTRAP_SUPERUSERID\s+(\d+)$/mg || die "Could not read BOOTSTRAUP_SUPERUSERID from pg_authid.h\n"; @@ -78,9 +65,6 @@ sub genbki $indata =~ s{^TransactionId}{xid}gm; $indata =~ s{\(TransactionId}{(xid}g; $indata =~ s{PGUID}{$bootstrapsuperuserid}g; - $indata =~ s{NAMEDATALEN}{$namedatalen}g; - $indata =~ s{FLOAT4PASSBYVAL}{$float4passbyval}g; - $indata =~ s{FLOAT8PASSBYVAL}{$float8passbyval}g; $indata =~ s{PGNSP}{$pgcatalognamespace}g; #print $indata; |