MonetDB: embedded - we are linking! repeat, we are linking

[Hannes Muehleisen]

Changeset: 0ad8aef06713 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ad8aef06713
Modified Files:
        gdk/gdk_utils.c
        tools/embedded/rpackage/configure.win
        tools/embedded/windows/libtool.sh
        tools/embedded/windows/monetdb_config.h.in
        tools/embedded/windows/sedscript
Branch: embedded
Log Message:

we are linking! repeat, we are linking


diffs (74 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1079,9 +1079,11 @@ GDKinit(opt *set, int setlen)
 #endif
 #ifdef WIN32
        (void) signal(SIGABRT, BATSIGabort);
+#ifndef __MINGW32__ // MinGW does not have these
        _set_abort_behavior(0, _CALL_REPORTFAULT | _WRITE_ABORT_MSG);
        _set_error_mode(_OUT_TO_STDERR);
 #endif
+#endif
        /* now try to lock the database */
        GDKlockHome();
 
diff --git a/tools/embedded/rpackage/configure.win 
b/tools/embedded/rpackage/configure.win
--- a/tools/embedded/rpackage/configure.win
+++ b/tools/embedded/rpackage/configure.win
@@ -1,2 +1,3 @@
 # When configure.win is run the environment variables R_HOME (which uses 
‘/’ as the file separator), R_ARCH and Use R_ARCH_BIN will be set. Use 
R_ARCH to decide if this is a 64-bit build (its value there is ‘/x64’) and 
to install DLLs to the correct place (${R_HOME}/libs${R_ARCH}). Use R_ARCH_BIN 
to find the correct place under the bin directory, e.g. 
${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe.
 
+# TODO: run tools/embedded/windows/pmc.sh
diff --git a/tools/embedded/windows/libtool.sh 
b/tools/embedded/windows/libtool.sh
--- a/tools/embedded/windows/libtool.sh
+++ b/tools/embedded/windows/libtool.sh
@@ -17,9 +17,14 @@ if [ "$1" = "--mode=link" ]; then
                # TODO
                ;;
                -version-info) ;;
+               1) ;;
                -module) ;;
                -avoid-version) ;;
+               -m64) ;;
+               -O3) ;;
+               /monetdb5) ;; # TODO: find nicer way of skipping these.
                -D*) ;;
+               -I*) ;;
                -o) out=1 ;; 
                *)
                call="$call $1"
diff --git a/tools/embedded/windows/monetdb_config.h.in 
b/tools/embedded/windows/monetdb_config.h.in
--- a/tools/embedded/windows/monetdb_config.h.in
+++ b/tools/embedded/windows/monetdb_config.h.in
@@ -71,6 +71,9 @@
 /* location where binaries are installed */
 /* #undef BINDIR */
 
+#define BINDIR "foo"
+// TODO: fixme
+
 /* read-only architecture-independent data */
 #define DATA_DIR PREFIX "\\share"
 
@@ -110,7 +113,7 @@
 /* #undef HAVE_CRYPT_H */
 
 /* Define to 1 if you have the `ctime_r' function. */
-#define HAVE_CTIME_R 1
+//#define HAVE_CTIME_R 1
 
 /* Define if you have ctime_r(time_t*,char *buf,size_t s) */
 //#define HAVE_CTIME_R3 1
diff --git a/tools/embedded/windows/sedscript b/tools/embedded/windows/sedscript
--- a/tools/embedded/windows/sedscript
+++ b/tools/embedded/windows/sedscript
@@ -43,7 +43,7 @@ s|@CC@|gcc|
 s|@CCDEPMODE@||
 s|@cfitsio_CFLAGS@||
 s|@cfitsio_LIBS@||
-s|@CFLAGS@||
+s|@CFLAGS@|-m64 -O3 -I"C:/Program Files/R/R-3.2.1/include"|
 s|@CLASSPATH@||
 s|@compilercall@||
 s|@configure_input@||
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list