[postgis-tickets] r17451 - Make build with wagyu the default when protobuf is also enabled
Regina Obe
lr at pcorp.us
Fri May 31 06:29:14 PDT 2019
Author: robe
Date: 2019-05-31 18:29:14 -0700 (Fri, 31 May 2019)
New Revision: 17451
Removed:
trunk/ci/travis/run_wagyu.sh
Modified:
trunk/.travis.yml
trunk/NEWS
trunk/configure.ac
trunk/doc/installation.xml
Log:
Make build with wagyu the default when protobuf is also enabled
Closes https://github.com/postgis/postgis/pull/406
Modified: trunk/.travis.yml
===================================================================
--- trunk/.travis.yml 2019-05-31 21:37:49 UTC (rev 17450)
+++ trunk/.travis.yml 2019-06-01 01:29:14 UTC (rev 17451)
@@ -11,7 +11,7 @@
- tag=pg11-geos37-gdal24-proj52 mode=coverage
- tag=pg11-geos37-gdal24-proj52 mode=usan_gcc
- tag=pg11-geos37-gdal24-proj52 mode=usan_clang
- - tag=pg11-geos37-gdal24-proj52 mode=wagyu
+ - tag=pg11-geos37-gdal24-proj52 mode=nowagyu
- tag=pg11-geos37-gdal24-proj52 mode=tests
- tag=pg10-geos36-gdal23-proj49 mode=tests
- tag=pg96-geos36-gdal22-proj49 mode=tests
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2019-05-31 21:37:49 UTC (rev 17450)
+++ trunk/NEWS 2019-06-01 01:29:14 UTC (rev 17451)
@@ -1,3 +1,18 @@
+PostGIS 3.0.0alpha2
+2019/XX/XX
+
+For full changes and enhancements, refer to PostGIS 3.0.0 section.
+This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
+Additional features enabled if you are running Proj6+ and PostgreSQL 12
+
+* Major highlights *
+ - #4404, Fix selectivity issue with support functions (Paul Ramsey)
+ - #4311, Make wagyu the default option to validate polygons.
+ This option requires a C++11 compiler and will use CXXFLAGS (not CFLAGS).
+ Add `--without-wagyu` to disable this option and keep the behaviour
+ from 2.5 (Raúl Marín)
+
+
PostGIS 3.0.0alpha1
2019/05/26
For full changes and enhancements, refer to PostGIS 3.0.0 section.
@@ -59,7 +74,9 @@
within, equals (Esteban Zimányi and Arthur Lesuisse from Université
Libre de Bruxelles (ULB), Darafei Praliaskouski)
- #4171, ST_3DLineInterpolatePoint (Julien Cabieces, Vincent Mora)
- - #4311, Introduce `--with-wagyu` as an option for MVT polygons (Raúl Marín)
+ - #4311, Introduce WAGYU to validate MVT polygons. This option requires a C++11
+ compiler and will use CXXFLAGS (not CFLAGS). Add `--without-wagyu`
+ to disable this option and keep the behaviour from 2.5 (Raúl Marín)
- #1833, ST_AsGeoJSON(row) generates full GeoJSON Features (Joe Conway)
- #3687, Casts json(geometry) and jsonb(geometry) for implicit GeoJSON
generation (Paul Ramsey)
Deleted: trunk/ci/travis/run_wagyu.sh
===================================================================
--- trunk/ci/travis/run_wagyu.sh 2019-05-31 21:37:49 UTC (rev 17450)
+++ trunk/ci/travis/run_wagyu.sh 2019-06-01 01:29:14 UTC (rev 17451)
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-WARNINGS="-Werror -Wall -Wextra -Wformat -Werror=format-security"
-WARNINGS_DISABLED="-Wno-unused-parameter -Wno-implicit-fallthrough -Wno-cast-function-type"
-
-# Build with coverage
-CFLAGS="-g -O0 --coverage -mtune=generic -fno-omit-frame-pointer ${WARNINGS} ${WARNINGS_DISABLED}"
-LDFLAGS="--coverage"
-
-/usr/local/pgsql/bin/pg_ctl -c -l /tmp/logfile start
-./autogen.sh
-
-# Standard build
-./configure --with-wagyu CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-bash ./ci/travis/logbt -- make -j check RUNTESTFLAGS=--verbose
-curl -S -f https://codecov.io/bash -o .github/codecov.bash
-bash .github/codecov.bash
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2019-05-31 21:37:49 UTC (rev 17450)
+++ trunk/configure.ac 2019-06-01 01:29:14 UTC (rev 17451)
@@ -1472,9 +1472,9 @@
if test "x$HAVE_PROTOBUF" = "xyes"; then
AC_ARG_WITH(
[wagyu],
- AC_HELP_STRING([--with-wagyu], [Use the wagyu library]),
- [HAVE_WAGYU=yes],
- [HAVE_WAGYU=no])
+ AC_HELP_STRING([--without-wagyu], [Don't use the wagyu library]),
+ [HAVE_WAGYU=no],
+ [HAVE_WAGYU=yes])
if test "x$HAVE_WAGYU" = "xyes"; then
AC_MSG_RESULT([WAGYU: Wagyu usage requested])
Modified: trunk/doc/installation.xml
===================================================================
--- trunk/doc/installation.xml 2019-05-31 21:37:49 UTC (rev 17450)
+++ trunk/doc/installation.xml 2019-06-01 01:29:14 UTC (rev 17451)
@@ -241,7 +241,7 @@
To enable ST_AsMVT protobuf-c library (for usage) and the protoc-c compiler (for building) are required.
Also, pkg-config is required to verify the correct minimum version of protobuf-c.
See <ulink url="https://github.com/protobuf-c/protobuf-c">protobuf-c</ulink>.
- To use Wagyu to validate MVT polygons faster, a c++11 compiler is required. It requires <varname>--with-wagyu</varname> to be passed during configure; and it will use CXXFLAGS and the same compiler as the PostgreSQL installation.
+ By default, Postgis will use Wagyu to validate MVT polygons faster which requires a c++11 compiler. It will use CXXFLAGS and the same compiler as the PostgreSQL installation. To disable this and use GEOS instead use the <varname>--without-wagyu</varname> during the configure step.
</para>
</listitem>
@@ -599,10 +599,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><command>--with-wagyu</command></term>
+ <term><command>--without-wagyu</command></term>
<listitem>
<para>
- When building with MVT support, by default Postgis will use GEOS to clip and validate MVT polygons. You can use <ulink url="https://github.com/mapbox/wagyu/">Wagyu</ulink> instead which is faster and guaranteed to produce correct values for this specific case.
+ When building with MVT support, Postgis will use <ulink url="https://github.com/mapbox/wagyu/">Wagyu</ulink> to clip and validate MVT polygons. Wagyu is the fastest alternative and guarantees producing correct values for this specific case, but it requires a C++-11 compiler. With this optional argument you can disable using this library; GEOS will be used instead.
</para>
</listitem>
</varlistentry>
More information about the postgis-tickets
mailing list