Changeset: 5b4d83573d42 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b4d83573d42
Modified Files:
MonetDB.spec
debian/control
debian/fix-deb.sh
debian/rules
Branch: Jun2016
Log Message:
Be more precise in how we configure for a binary release.
diffs (147 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,6 +9,7 @@
%define bits 32
%else
%define bits 64
+%define with_int128=1
%endif
# only add .oidXX suffix if oid size differs from bit size
@@ -134,6 +135,7 @@ BuildRequires: liblas >= 1.8.0
%endif
BuildRequires: libatomic_ops-devel
BuildRequires: libcurl-devel
+BuildRequires: xz-devel
# BuildRequires: libmicrohttpd-devel
# BuildRequires: libsphinxclient-devel
BuildRequires: libuuid-devel
@@ -937,31 +939,43 @@ developer, but if you do want to test, t
--enable-console=yes \
--enable-debug=no \
--enable-developer=no \
+ --enable-embedded=no \
+ --enable-embedded-r=no \
--enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
--enable-gdk=yes \
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
+ --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
--enable-jdbc=no \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --enable-mapi=yes \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
+ --enable-netcdf=no \
--enable-odbc=yes \
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
--enable-profile=no \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
+ --enable-shp=no \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
+ --with-curl=yes \
+ --with-gdal=yes \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
--with-java=no \
--with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --with-libxml2=yes \
+ --with-lzma=yes \
+ --with-openssl=yes \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
+ --with-proj=no \
--with-pthread=yes \
--with-python2=yes \
--with-python3=%{?rhel:no}%{!?rhel:yes} \
@@ -969,6 +983,7 @@ developer, but if you do want to test, t
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
--with-sphinxclient=no \
--with-unixodbc=yes \
+ --with-uuid=yes \
--with-valgrind=no \
%{?comp_cc:CC="%{comp_cc}"}
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD
# http://www.debian.org/doc/debian-policy/ch-relationships.html
Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev,
libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
- libgsl0-dev, libpcre3-dev, libreadline-dev,
+ libgsl0-dev, libpcre3-dev, libreadline-dev, liblzma-dev,
libssl-dev, libxml2-dev, perl, pkg-config, python, python3,
unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0), r-base
Standards-Version: 3.8.0
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -17,5 +17,5 @@ if [[ ( $ID == debian && $VERSION_ID -lt
sed -i '/^Package:.*lidar/,/^$/d' debian/control
sed -i '/^Package:.*geom/,/^$/d' debian/control
rm debian/libmonetdb5-server-lidar.install
debian/libmonetdb5-server-geom.install
- sed -i '/geo[ms]=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/'
debian/rules
+ sed -i
'/geo[ms]=yes/s/yes/no/;/gdal=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/'
debian/rules
fi
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ override_dh_auto_configure:
--enable-console=yes \
--enable-debug=no \
--enable-developer=no \
+ --enable-embedded=no \
+ --enable-embedded-r=no \
--enable-fits=no \
--enable-gdk=yes \
--enable-geom=yes \
@@ -24,24 +26,33 @@ override_dh_auto_configure:
--enable-instrument=no \
--enable-jdbc=no \
--enable-lidar=yes \
+ --enable-mapi=yes \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
+ --enable-netcdf=no \
--enable-odbc=yes \
--enable-oid32=no \
--enable-optimize=yes \
--enable-profile=no \
--enable-rintegration=yes \
+ --enable-shp=no \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
+ --with-curl=yes \
+ --with-gdal=yes \
--with-geos=yes \
--with-java=no \
--with-liblas=yes \
+ --with-libxml2=yes \
+ --with-lzma=yes \
+ --with-openssl=yes \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
+ --with-proj=no \
--with-pthread=yes \
--with-python2=yes \
--with-python3=yes \
@@ -49,6 +60,7 @@ override_dh_auto_configure:
--with-samtools=yes \
--with-sphinxclient=no \
--with-unixodbc=yes \
+ --with-uuid=yes \
--with-valgrind=no \
X_CFLAGS=-g
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
