Christoph Berg pushed to branch experimental at Debian GIS Project / postgis
Commits: 60e1514c by Christoph Berg at 2019-07-15T14:45:30Z Add CPPFLAGS where missing. Spotted by blhc. - - - - - 51e516b4 by Christoph Berg at 2019-07-15T14:48:53Z debian/.gitlab-ci.yml: Disable reprotest until clang understands -ffile-prefix-map. - - - - - 4 changed files: - debian/.gitlab-ci.yml - debian/changelog - + debian/patches/cppflags - debian/patches/series Changes: ===================================== debian/.gitlab-ci.yml ===================================== @@ -4,3 +4,9 @@ include: variables: RELEASE: 'unstable' + +# disable reprotest until clang understands -ffile-prefix-map +reprotest: + only: + variables: + - $FALSE ===================================== debian/changelog ===================================== @@ -2,6 +2,9 @@ postgis (3.0.0~alpha3+dfsg-1~exp2) UNRELEASED; urgency=medium [ Christoph Berg ] * debian/tests/control: Tests don't need root, but support running as root. + * debian/.gitlab-ci.yml: Disable reprotest until clang understands + -ffile-prefix-map. + * Add CPPFLAGS where missing. Spotted by blhc. [ Bas Couwenberg ] * Update gbp.conf to use --source-only-changes by default. ===================================== debian/patches/cppflags ===================================== @@ -0,0 +1,52 @@ +Description: Add CPPFLAGS where missing. Spotted by blhc. + +--- a/libpgcommon/Makefile.in ++++ b/libpgcommon/Makefile.in +@@ -58,7 +58,7 @@ check: libpgcommon.a + + # Command to build each of the .o files + $(SA_OBJS): %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + + $(SA_OBJS): ../postgis_config.h + +--- a/loader/Makefile.in ++++ b/loader/Makefile.in +@@ -88,13 +88,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 \ +@@ -105,7 +105,7 @@ $(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgs + $(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 \ +--- 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 $@ ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ relax-test-timing-constraints.patch +cppflags View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/5e8b1f7acf7d23bc613462bf93ed1b129e971c11...51e516b4ea47c8ef4cb054882fe2a46e7e1f8374 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/5e8b1f7acf7d23bc613462bf93ed1b129e971c11...51e516b4ea47c8ef4cb054882fe2a46e7e1f8374 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
