diff options
| author | Noah Misch <noah@leadboat.com> | 2015-04-24 19:29:02 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-04-24 19:29:27 -0400 |
| commit | 5eab0f1383f0864fe038c2ab13282c9c356f291d (patch) | |
| tree | 9a5168695b5306615168ce3752e551c2d4c7ff16 | |
| parent | b743a8b313d4ab8c216a22d9898bf9b377ae0167 (diff) | |
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.
| -rw-r--r-- | src/interfaces/ecpg/compatlib/Makefile | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/Makefile | 2 | ||||
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index c8e294a3a37..350ee3d7c84 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 4 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) SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \ diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index 41f7cc0a874..4158b2b666f 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 3 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) # Need to recompile any libpgport object files diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 973ed824dba..2fafec240cc 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -282,6 +282,7 @@ sub mkvcbuild my $libecpgcompat = $solution->AddProject( 'libecpg_compat', 'dll', 'interfaces', 'src\interfaces\ecpg\compatlib'); + $libecpgcompat->AddDefine('FRONTEND'); $libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include'); $libecpgcompat->AddIncludeDir('src\interfaces\libpq'); $libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def'); |