mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't define FRONTEND for ecpg libraries

Browse Source 
Not needed anymore after 7143b3e8213.

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 06e3559bad
commit 9352d5cf12
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/ecpg/compatlib/Makefile
View File

@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= $(MAJORVERSION) SO_MINOR_VERSION= $(MAJORVERSION)
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) -DFRONTEND $(CPPFLAGS) -I$(libpq_srcdir) $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS) override CFLAGS += $(PTHREAD_CFLAGS)
SHLIB_LINK_INTERNAL = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq_pgport_shlib) SHLIB_LINK_INTERNAL = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq_pgport_shlib)

2
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 6
SO_MINOR_VERSION= $(MAJORVERSION) SO_MINOR_VERSION= $(MAJORVERSION)
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_builddir)/src/port -DFRONTEND $(CPPFLAGS) -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS) override CFLAGS += $(PTHREAD_CFLAGS)
OBJS = \ OBJS = \

2
src/interfaces/ecpg/pgtypeslib/Makefile
View File

@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= $(MAJORVERSION) SO_MINOR_VERSION= $(MAJORVERSION)
override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
-DFRONTEND $(CPPFLAGS) $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS) override CFLAGS += $(PTHREAD_CFLAGS)
SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib SHLIB_LINK_INTERNAL = -lpgcommon_shlib -lpgport_shlib

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

@ -315,14 +315,12 @@ sub mkvcbuild
my $pgtypes = $solution->AddProject( my $pgtypes = $solution->AddProject(
'libpgtypes', 'dll', 'libpgtypes', 'dll',
'interfaces', 'src/interfaces/ecpg/pgtypeslib'); 'interfaces', 'src/interfaces/ecpg/pgtypeslib');
$pgtypes->AddDefine('FRONTEND');
$pgtypes->AddReference($libpgcommon, $libpgport); $pgtypes->AddReference($libpgcommon, $libpgport);
$pgtypes->UseDef('src/interfaces/ecpg/pgtypeslib/pgtypeslib.def'); $pgtypes->UseDef('src/interfaces/ecpg/pgtypeslib/pgtypeslib.def');
$pgtypes->AddIncludeDir('src/interfaces/ecpg/include'); $pgtypes->AddIncludeDir('src/interfaces/ecpg/include');
my $libecpg = $solution->AddProject('libecpg', 'dll', 'interfaces', my $libecpg = $solution->AddProject('libecpg', 'dll', 'interfaces',
'src/interfaces/ecpg/ecpglib'); 'src/interfaces/ecpg/ecpglib');
$libecpg->AddDefine('FRONTEND');
$libecpg->AddIncludeDir('src/interfaces/ecpg/include'); $libecpg->AddIncludeDir('src/interfaces/ecpg/include');
$libecpg->AddIncludeDir('src/interfaces/libpq'); $libecpg->AddIncludeDir('src/interfaces/libpq');
$libecpg->AddIncludeDir('src/port'); $libecpg->AddIncludeDir('src/port');
@ -333,7 +331,6 @@ 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');