Changeset: e664493f4188 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e664493f4188
Modified Files:
MonetDB.spec
debian/control
debian/rules
monetdb_config.h.in
Branch: default
Log Message:
Update rpm and deb configs.
diffs (97 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -113,12 +113,14 @@ BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(openssl) >= 1.1.1
-%global with_openssl 1
+BuildRequires: pkgconfig(snappy)
%if %{with pcre}
BuildRequires: pkgconfig(libpcre2-8)
%endif
BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(liblz4) >= 1.8
+BuildRequires: pkgconfig(libbrotlidec)
BuildRequires: pkgconfig(libxxhash)
# optional packages:
# BuildRequires: pkgconfig(cmocka) # -DWITH_CMOCKA=ON
@@ -893,20 +895,23 @@ fi
-DSHP=OFF \
-DSTRICT=OFF \
-DTESTING=ON \
+ -DWITH_BROTLI=ON \
-DWITH_BZ2=ON \
-DWITH_CMOCKA=OFF \
-DWITH_CURL=ON \
-DWITH_LZ4=ON \
-DWITH_LZMA=ON \
- -DWITH_OPENSSL=%{?with_openssl:ON}%{!?with_openssl:OFF} \
+ -DWITH_OPENSSL=ON \
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
-DWITH_RTREE=OFF \
+ -DWITH_SNAPPY=ON \
-DWITH_SQLPARSE=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
- -DWITH_ZLIB=ON
+ -DWITH_ZLIB=ON \
+ -DWITH_ZSTD=ON
%cmake_build
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper-compat (= 12),
libxml2-dev, pkg-config, libxxhash-dev,
python3,
unixodbc-dev, zlib1g-dev,
- libcfitsio-dev, libssl-dev (>= 1.1.1)
+ libcfitsio-dev, libssl-dev (>= 1.1.1),
+ libsnappy-dev, libzstd-dev, libbrotli-dev
Standards-Version: 4.6.2
Package: libmonetdb31
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -29,19 +29,23 @@ override_dh_auto_configure:
-DSHP=OFF \
-DSTRICT=OFF \
-DTESTING=ON \
+ -DWITH_BROTLI=ON \
-DWITH_BZ2=ON \
-DWITH_CMOCKA=OFF \
-DWITH_CURL=ON \
-DWITH_LZ4=ON \
-DWITH_LZMA=ON \
+ -DWITH_OPENSSL=ON \
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
-DWITH_RTREE=OFF \
+ -DWITH_SNAPPY=ON \
-DWITH_SQLPARSE=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
- -DWITH_ZLIB=ON
+ -DWITH_ZLIB=ON \
+ -DWITH_ZSTD=-ON
# currently the test suite fails
override_dh_auto_test:
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -182,7 +182,6 @@
// optional code: libraries that may or may not be available,
// optional extensions
#cmakedefine HAVE_BROTLI 1
-#cmakedefine HAVE_CUDF 1
#cmakedefine HAVE_CURL 1
#cmakedefine HAVE_FITS 1
#cmakedefine HAVE_GEOM 1
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
