Changeset: 0899d4c66fdb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0899d4c66fdb
Modified Files:
MonetDB.spec
debian/rules
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (47 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -2,8 +2,8 @@
%define version 11.32.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
-# Use %bcond_with to add a --with option; i.e., "without" is default.
-# Use %bcond_without to add a --without option; i.e., "with" is default.
+# Use bcond_with to add a --with option; i.e., "without" is default.
+# Use bcond_without to add a --without option; i.e., "with" is default.
# The --with OPTION and --without OPTION arguments can be passed on
# the commandline of both rpmbuild and mock.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -28,10 +28,13 @@ override_dh_auto_configure:
--enable-netcdf=no \
--enable-odbc=yes \
--enable-optimize=yes \
+ --enable-py3integration=no \
--enable-pyintegration=yes \
--enable-rintegration=yes \
+ --enable-sanitizer=no \
--enable-shp=no \
--enable-sql=yes \
+ --enable-static-analysis=no \
--enable-strict=no \
--enable-testing=yes \
--with-bz2=yes \
@@ -40,6 +43,7 @@ override_dh_auto_configure:
--with-geos=yes \
--with-liblas=yes \
--with-libxml2=yes \
+ --with-lz4=no \
--with-lzma=yes \
--with-openssl=yes \
--with-proj=no \
@@ -49,6 +53,7 @@ override_dh_auto_configure:
--with-readline=yes \
--with-regex=PCRE \
--with-samtools=yes \
+ --with-snappy=no \
--with-unixodbc=yes \
--with-uuid=yes \
--with-valgrind=no \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
