Changeset: bb467721c645 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb467721c645
Modified Files:
clients/R/MonetDB.R/R/dbi.R
tools/embedded/rpackage/configure
Branch: embedded
Log Message:
disable asserts and strict for build
diffs (30 lines):
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -432,8 +432,7 @@ setMethod("dbWriteTable", "MonetDBConnec
if (csvdump) {
tmp <- tempfile(fileext = ".csv")
write.table(value, tmp, sep = ",", quote = TRUE, row.names = FALSE,
col.names = FALSE,na="")
- dbSendQuery(conn, paste0("COPY ",format(nrow(value),
scientific=FALSE)," RECORDS INTO ", qname,
- " FROM '", tmp, "' USING DELIMITERS ',','\\n','\"' NULL AS ''"))
+ dbSendQuery(conn, paste0("COPY INTO ", qname, " FROM '", tmp, "' USING
DELIMITERS ',','\\n','\"' NULL AS ''"))
file.remove(tmp)
} else {
vins <- paste("(", paste(rep("?", length(value)), collapse=', '), ")",
sep='')
diff --git a/tools/embedded/rpackage/configure
b/tools/embedded/rpackage/configure
--- a/tools/embedded/rpackage/configure
+++ b/tools/embedded/rpackage/configure
@@ -2,11 +2,11 @@
cd src
CFLAGS="-I$R_INCLUDE_DIR" ./configure --prefix=$R_PACKAGE_DIR/install \
---enable-embedded --disable-fits --disable-geom --disable-rintegration
--disable-gsl --disable-netcdf \
+--enable-embedded --disable-fits --disable-geom --disable-rintegration
--disable-gsl --disable-netcdf \
--disable-jdbc --disable-merocontrol --disable-odbc --disable-console
--disable-microhttpd \
--without-perl --without-python2 --without-python3 --without-rubygem
--without-unixodbc \
--without-samtools --without-sphinxclient --without-geos --without-samtools
--without-readline \
---enable-optimize --enable-silent-rules
+--enable-optimize --enable-silent-rules --disable-assert --disable-strict
# Dirty hack, normally R would call make, but we need to also do a make
install to get the libs in place.
# So we do it ourselves instead and then render the MonetDB makefile inert.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
