mirror of
https://github.com/postgres/postgres.git
synced 2025-05-17 06:41:24 +03:00
Build every ECPG library with -DFRONTEND.
Each of the libraries incorporates src/port files, which often check FRONTEND. Build systems disagreed on whether to build libpgtypes this way. Only libecpg incorporates files that rely on it today. Back-patch to 9.0 (all supported versions) to forestall surprises.
This commit is contained in:
parent
c82e13a915
commit
05c13920a1
@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3
|
|||||||
SO_MINOR_VERSION= 5
|
SO_MINOR_VERSION= 5
|
||||||
|
|
||||||
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
|
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
|
||||||
-I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
|
-I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils -DFRONTEND $(CPPFLAGS)
|
||||||
override CFLAGS += $(PTHREAD_CFLAGS)
|
override CFLAGS += $(PTHREAD_CFLAGS)
|
||||||
|
|
||||||
SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \
|
SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \
|
||||||
|
@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3
|
|||||||
SO_MINOR_VERSION= 4
|
SO_MINOR_VERSION= 4
|
||||||
|
|
||||||
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
|
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
|
||||||
-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS)
|
-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)
|
||||||
override CFLAGS += $(PTHREAD_CFLAGS)
|
override CFLAGS += $(PTHREAD_CFLAGS)
|
||||||
|
|
||||||
# Need to recompile any libpgport object files
|
# Need to recompile any libpgport object files
|
||||||
|
@ -306,6 +306,7 @@ sub mkvcbuild
|
|||||||
my $libecpgcompat = $solution->AddProject(
|
my $libecpgcompat = $solution->AddProject(
|
||||||
'libecpg_compat', 'dll',
|
'libecpg_compat', 'dll',
|
||||||
'interfaces', 'src\interfaces\ecpg\compatlib');
|
'interfaces', 'src\interfaces\ecpg\compatlib');
|
||||||
|
$libecpgcompat->AddDefine('FRONTEND');
|
||||||
$libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include');
|
$libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include');
|
||||||
$libecpgcompat->AddIncludeDir('src\interfaces\libpq');
|
$libecpgcompat->AddIncludeDir('src\interfaces\libpq');
|
||||||
$libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def');
|
$libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user