Changeset: 27a50f41ffe5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27a50f41ffe5
Modified Files:
clients/Tests/exports.stable.out
debian/fix-deb.sh
gdk/gdk.h
gdk/gdk_private.h
Branch: default
Log Message:
Merge heads.
diffs (99 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -169,6 +169,7 @@ void BATrmprop(BAT *b, enum prop_t idx);
gdk_return BATroles(BAT *b, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
BAT *BATsample_with_seed(BAT *b, BUN n, unsigned seed);
+gdk_return BATsave(BAT *b) __attribute__((__warn_unused_result__));
BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, bool li, bool
hi, bool anti);
gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATsetaccess(BAT *b, restrict_t mode);
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -45,36 +45,15 @@ if [[ $ARCH == i?86 ]]; then
fi
case $SUITE in
-trusty)
- # fix control file because this system doesn't have liblas and a
- # too old version of libgeos
- sed -i -e 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' \
- -e 's/libcfitsio-dev/libcfitsio3-dev/' \
- -e '/^Package:.*lidar/,/^$/d' \
- -e '/^Package:.*geom/,/^$/d' debian/control
- rm debian/libmonetdb5-server-lidar.install
debian/libmonetdb5-server-geom.install
- 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
- ;;
-esac
-
-case $SUITE in
-jessie | trusty)
- # Xenial Xerus (and presumably newer releases) uses php-cli,
- # all others still have php5-cli and don't have php*-sockets
+jessie)
+ # Debian 8 still have php5-cli and doesn't have php*-sockets;
+ # newer ones use php-cli and do have php-sockets.
sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
;;
esac
case $SUITE in
-trusty)
- # the trusty linker produces unresolved references to openSSL functions
- sed -i '/openssl_LIBS/s/WIN32?//' clients/mapilib/Makefile.ag
- sed -i '/^libmapi_la_LIBADD/s/$/ $(openssl_LIBS)/'
clients/mapilib/Makefile.am clients/mapilib/Makefile.in
- ;;
-esac
-
-case $SUITE in
-jessie | trusty)
+jessie)
# The Python 3 version is too old for py3integration.
sed -i '/^Package: monetdb-python3/,/^$/d' debian/control
sed -i 's/ python3-dev, python3-numpy,//' debian/control
@@ -83,18 +62,6 @@ jessie | trusty)
;;
esac
-case $SUITE in
-cosmic)
- # libbam is not available as a shared object (also true for older
- # version) and this means that on 18.10 the libmonetdb5-server-bam
- # package cannot be compiled on amd64
- sed -i -e 's/libbam-dev, //' \
- -e '/^Package: libmonetdb5-server-bam/,/^$/d' debian/control
- sed -i '/samtools=yes/s/yes/no/' debian/rules
- rm debian/libmonetdb5-server-bam.install
- ;;
-esac
-
# debhelper compatibility 9 and later support multiarch by using
# architecture-specific subdirectories in /usr/lib (and /lib); our
# code base is set up for amd64 (x86_64), so change to whatever
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1369,6 +1369,8 @@ gdk_export gdk_return BATgroup(BAT **gro
* @emph{th}) for variable-sized atoms.
*/
+gdk_export gdk_return BATsave(BAT *b)
+ __attribute__((__warn_unused_result__));
gdk_export void BATmsync(BAT *b);
#define NOFARM (-1) /* indicate to GDKfilepath to create relative path */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -74,9 +74,6 @@ enum heaptype {
__hidden gdk_return BATmaterialize(BAT *b)
__attribute__((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
-__hidden gdk_return BATsave(BAT *b)
- __attribute__((__warn_unused_result__))
- __attribute__((__visibility__("hidden")));
__hidden void BATsetdims(BAT *b)
__attribute__((__visibility__("hidden")));
__hidden gdk_return BBPcacheit(BAT *bn, bool lock)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
