[postgis-tickets] r15130 - pgcommon/Makefile.in orders CFLAGS incorrectly leading to wrong liblwgeom.h

[Regina Obe]

Author: robe
Date: 2016-09-22 23:39:13 -0700 (Thu, 22 Sep 2016)
New Revision: 15130

Modified:
   branches/2.2/NEWS
   branches/2.2/libpgcommon/Makefile.in
   branches/2.2/postgis/Makefile.in
   branches/2.2/raster/rt_core/Makefile.in
   branches/2.2/raster/rt_pg/Makefile.in
Log:
pgcommon/Makefile.in orders CFLAGS incorrectly leading to wrong liblwgeom.h
(Fix to use source version instead of installed)
Patch from Greg Troxel
references #3604 for PostGIS 2.2.3

Modified: branches/2.2/NEWS
===================================================================
--- branches/2.2/NEWS	2016-09-22 16:10:43 UTC (rev 15129)
+++ branches/2.2/NEWS	2016-09-23 06:39:13 UTC (rev 15130)
@@ -17,7 +17,9 @@
   - #3569, Incorrect coordinates returned by ST_CollectionHomogenize
            (Dan Baston)
   - #3602, perl as found by configure is not used 
-           in tiger extension, postgis_sfcgal, address_standardizer  
+           in tiger extension, postgis_sfcgal, address_standardizer
+  - #3604, pgcommon/Makefile.in orders CFLAGS leads to installed liblwgeom.h
+		 (Greg Troxel)
   - #3607, Fix inconsistency with multilinestring in
            ST_LocateBetweenElevations (Artur Zakirov)
   - #3608, Fix crash passing -W UTF-8 to shp2pgsql (Matt Amos)

Modified: branches/2.2/libpgcommon/Makefile.in
===================================================================
--- branches/2.2/libpgcommon/Makefile.in	2016-09-22 16:10:43 UTC (rev 15129)
+++ branches/2.2/libpgcommon/Makefile.in	2016-09-23 06:39:13 UTC (rev 15130)
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 CC=@CC@
-CFLAGS=@CFLAGS@ -I../liblwgeom @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GETTEXT_CFLAGS@
+CFLAGS=-I../liblwgeom @CFLAGS@ @PGSQL_BE_CPPFLAGS@ @PROJ_CPPFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GETTEXT_CFLAGS@
 LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
 
 NUMERICFLAGS=@NUMERICFLAGS@

Modified: branches/2.2/postgis/Makefile.in
===================================================================
--- branches/2.2/postgis/Makefile.in	2016-09-22 16:10:43 UTC (rev 15129)
+++ branches/2.2/postgis/Makefile.in	2016-09-23 06:39:13 UTC (rev 15130)
@@ -90,7 +90,8 @@
 # to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
 # older version of PostGIS, rather than with the static liblwgeom.a
 # supplied with newer versions of PostGIS
-PG_CPPFLAGS += -I../liblwgeom -I../libpgcommon @CPPFLAGS@ -fPIC
+override CFLAGS := -I../liblwgeom $(CFLAGS)
+PG_CPPFLAGS += -I../libpgcommon @CPPFLAGS@ -fPIC
 SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
 
 # Add SFCGAL Flags if defined

Modified: branches/2.2/raster/rt_core/Makefile.in
===================================================================
--- branches/2.2/raster/rt_core/Makefile.in	2016-09-22 16:10:43 UTC (rev 15129)
+++ branches/2.2/raster/rt_core/Makefile.in	2016-09-23 06:39:13 UTC (rev 15130)
@@ -28,7 +28,7 @@
 GEOS_LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c
 PROJ_LDFLAGS = @PROJ_LDFLAGS@ -lproj
 LDFLAGS = $(LIBLWGEOM_LDFLAGS) $(LIBGDAL_LDFLAGS) $(PROJ_LDFLAGS) $(GEOS_LDFLAGS)
-CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ $(LIBLWGEOM_CFLAGS) $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
+CFLAGS = $(LIBLWGEOM_CFLAGS) @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ $(LIBGDAL_CFLAGS) @PROJ_CPPFLAGS@ @GEOS_CPPFLAGS@
 
 # Standalone RTCORE objects
 RT_OBJS = \

Modified: branches/2.2/raster/rt_pg/Makefile.in
===================================================================
--- branches/2.2/raster/rt_pg/Makefile.in	2016-09-22 16:10:43 UTC (rev 15129)
+++ branches/2.2/raster/rt_pg/Makefile.in	2016-09-23 06:39:13 UTC (rev 15130)
@@ -65,7 +65,8 @@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@
 
-PG_CPPFLAGS+=@CPPFLAGS@ $(LIBLWGEOM_CFLAGS) $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
+override CFLAGS := $(LIBLWGEOM_CFLAGS) $(CFLAGS)
+PG_CPPFLAGS+= @CPPFLAGS@ $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
 SHLIB_LINK_F = ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS) $(LIBGDAL_LDFLAGS) @SHLIB_LINK@ 
 
 # Extra files to remove during 'make clean'