]> granicus.if.org Git - postgresql/commitdiff
Build every ECPG library with -DFRONTEND.
authorNoah Misch <noah@leadboat.com>
Fri, 24 Apr 2015 23:29:02 +0000 (19:29 -0400)
committerNoah Misch <noah@leadboat.com>
Fri, 24 Apr 2015 23:30:08 +0000 (19:30 -0400)
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.

src/interfaces/ecpg/compatlib/Makefile
src/interfaces/ecpg/pgtypeslib/Makefile
src/tools/msvc/Mkvcbuild.pm

index 19b1e86e9641f005536f7486117995389bb05df9..45c8f9462f4f9cb3c22259539b23db06a7df11ac 100644 (file)
@@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3
 SO_MINOR_VERSION= 2
 
 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) \
index 5dd538a407407af93427297fc1d40fc436d0fafa..7f71e1bc5cc8d1c2cc562a70f30cae2b7312d00c 100644 (file)
@@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3
 SO_MINOR_VERSION= 1
 
 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
index 5361a5c41e14836db41347ad0e8cfcacf1742d5c..fa97c79471de48b0913f98c0b546a8192e0fb1bd 100644 (file)
@@ -241,6 +241,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');