Changeset: 5b247386dc5a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b247386dc5a
Modified Files:
java/embedded/Makefile.ag
Branch: embedded-java
Log Message:
Do not unnecessarily include libmonetdb5 and libbat in libembedded_java
We only need to include libembedded, it takes care of the rest. This way we
avoid pre-loading them when starting-up. The unnecessarily pre-loading causing
issues when trying loading them again to find symbols in monetdb_startup().
Note: This used to work as some point, with pre-loaded libmonetdb5, since I had
crammed Java and generic embedded code (hacing copied it verbatim from the
separate emebdded lib) in a single library.
diffs (12 lines):
diff --git a/java/embedded/Makefile.ag b/java/embedded/Makefile.ag
--- a/java/embedded/Makefile.ag
+++ b/java/embedded/Makefile.ag
@@ -41,8 +41,6 @@ lib_embedded_java = {
org_monetdb_embedded_result_EmbeddedQueryResult.c
org_monetdb_embedded_result_EmbeddedQueryResult.h
VERSION = 1
LIBS = ../../tools/embedded/libembedded \
- ../../monetdb5/tools/libmonetdb5 \
- ../../gdk/libbat \
$(pcre_LIBS) $(PSAPILIB) \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(DL_LIBS) $(PTHREAD_LIBS)
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
