MonetDB: Jul2021 - Don't complain when optional built-in modules...

[Sjoerd Mullender]

Changeset: 941ba6021574 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/941ba6021574
Modified Files:
        monetdb5/mal/mal_linker.c
Branch: Jul2021
Log Message:

Don't complain when optional built-in modules can't be loaded, but do about 
others.


diffs (37 lines):

diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -264,7 +264,32 @@ loadLibrary(const char *filename, int fl
        }
 
        if (handle == NULL) {
-               if (flag)
+               if (strcmp(filename, "monetdb5") != 0 && strcmp(filename, 
"sql") != 0
+                       && strcmp(filename, "generator") != 0
+                       && strcmp(filename, "opt_sql_append") != 0
+#ifdef HAVE_GEOM
+                       && strcmp(filename, "geom") != 0
+#endif
+#ifdef HAVE_LIBR
+                       && strcmp(filename, "rapi") != 0
+#endif
+#ifdef HAVE_LIBPY3
+                       && strcmp(filename, "pyapi3") != 0
+#endif
+#ifdef HAVE_CUDF
+                       && strcmp(filename, "capi") != 0
+#endif
+                       && strcmp(filename, "udf") != 0
+#ifdef HAVE_FITS
+                       && strcmp(filename, "fits") != 0
+#endif
+#ifdef HAVE_NETCDF
+                       && strcmp(filename, "netcdf") != 0
+#endif
+#ifdef HAVE_SHP
+                       && strcmp(filename, "shp") != 0
+#endif
+                       )
                        throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR " could 
not locate library %s (from within file '%s'): %s", s, filename, dlerror());
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list