Add CPPFLAGS where missing

Spotted by Debian's build log hardening checker, blhc.

https://salsa.debian.org/debian-gis-team/postgis/-/jobs/222378

Patch by Christoph Berg <myon -at- debian.org>

git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@17607 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index da368cc85380b0fdccced14c4cd276b98c180add..72b0b37c609c43e40efb59c6b6a9d81b0ec32b12 100644 (file)
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -57,8 +57,8 @@ check: libpgcommon.a
        $(MAKE) -C cunit check
 
 # Command to build each of the .o files
-$(SA_OBJS): %.o: %.c 
-       $(CC) $(CFLAGS) -c -o $@ $<
+$(SA_OBJS): %.o: %.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 $(SA_OBJS): ../postgis_config.h
 

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 830db51c8fd14999e1599165f5d8d38cecc5e812..f20670e3fc868af20007a1f13ef8e0e0726cfc4a 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -87,13 +87,13 @@ $(LIBLWGEOM):
        $(MAKE) -C ../liblwgeom
 
 shp2pgsql-core.o: shp2pgsql-core.c shp2pgsql-core.h shpcommon.h
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 pgsql2shp-core.o: pgsql2shp-core.c pgsql2shp-core.h shpcommon.h
-       $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
 
 pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2shp-core.h shpcommon.h
-       $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
 
 $(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
        $(LIBTOOL) --mode=link \
@@ -104,7 +104,7 @@ $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
          $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
 
 shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
-       $(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
 
 $(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
        $(LIBTOOL) --mode=link \

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index f7353dbe664cf7b6133f4861723823bed484e888..21d9f128a8929d0de0854659419f227dbe8eef7b 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -79,7 +79,7 @@ LDFLAGS = \
 all: $(RASTER2PGSQL)
 
 raster2pgsql.o: raster2pgsql.c
-       $(CC) $(CFLAGS) -c $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(RASTER2PGSQL): $(RT_CORE)/librtcore.a raster2pgsql.o
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@