Changeset: 82fb23adb62a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=82fb23adb62a
Modified Files:
geom/monetdb5/Makefile.ag
monetdb5/extras/mal_optimizer_template/Makefile.ag
monetdb5/extras/rapi/Makefile.ag
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/UDF/capi/Makefile.ag
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/udf/Makefile.ag
sql/backends/monet5/generator/Makefile.ag
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/shp/Makefile.ag
Branch: Mar2018
Log Message:
On Unix/Linux don't link dynamic libraries from the server into modules.
On Unix/Linux, when linking, references to the dynamic libraries on
the link command line are filled in so that when the module is loaded
there are actually two copies of the linked-to library loaded: the one
the server was linked to and the one the dynamically loaded module was
linked to.
On Windows, the linker merely adds stubs for references and when the
module is loaded those stubs find the actual code in the already
loaded dynamic libraries.
diffs (235 lines):
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -17,9 +17,9 @@ lib__geom = {
DIR = libdir/monetdb5
SOURCES = geom.h geom.c geomBulk.c geom_upgrade.c
LIBS = ../lib/libgeom \
- ../../gdk/libbat \
- ../../common/stream/libstream \
- ../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../gdk/libbat \
+ NATIVE_WIN32?../../common/stream/libstream \
+ NATIVE_WIN32?../../monetdb5/tools/libmonetdb5 \
$(GEOS_LIBS) $(PROJ_LIBS)
}
diff --git a/monetdb5/extras/mal_optimizer_template/Makefile.ag
b/monetdb5/extras/mal_optimizer_template/Makefile.ag
--- a/monetdb5/extras/mal_optimizer_template/Makefile.ag
+++ b/monetdb5/extras/mal_optimizer_template/Makefile.ag
@@ -18,9 +18,9 @@ lib_opt_sql_append = {
DIR = libdir/monetdb5
SEP = _
SOURCES = opt_sql_append.c opt_sql_append.h
- LIBS = ../../tools/libmonetdb5 \
- ../../../gdk/libbat \
- ../../../common/stream/libstream \
+ LIBS = NATIVE_WIN32?../../tools/libmonetdb5 \
+ NATIVE_WIN32?../../../gdk/libbat \
+ NATIVE_WIN32?../../../common/stream/libstream \
$(MALLOC_LIBS)
}
diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag
--- a/monetdb5/extras/rapi/Makefile.ag
+++ b/monetdb5/extras/rapi/Makefile.ag
@@ -29,9 +29,9 @@ lib__rapi = {
DIR = libdir/monetdb5
SOURCES = rapi.c rapi.h converters.c.h
XDEPS = $(libr_LIBDEP)
- LIBS = ../../tools/libmonetdb5 \
- ../../../gdk/libbat \
- $(MALLOC_LIBS) $(libr_LIBS)
+ LIBS = NATIVE_WIN32?../../tools/libmonetdb5 \
+ NATIVE_WIN32?../../../gdk/libbat \
+ $(MALLOC_LIBS) $(libr_LIBS)
}
headers_rapi_mal = {
diff --git a/sql/backends/monet5/LSST/Makefile.ag
b/sql/backends/monet5/LSST/Makefile.ag
--- a/sql/backends/monet5/LSST/Makefile.ag
+++ b/sql/backends/monet5/LSST/Makefile.ag
@@ -22,8 +22,8 @@ lib__lsst = {
MODULE
DIR = libdir/monetdb5
SOURCES = lsst.c lsst.h
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat
+ LIBS = NATIVE_WIN32?../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../gdk/libbat
}
headers_lsstmal = {
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -51,10 +51,10 @@ lib__sql = {
../../storage/libstore \
../../storage/bat/libbatstore \
../../common/libsqlcommon \
- ../../../monetdb5/tools/libmonetdb5 \
- ../../../gdk/libbat \
- ../../../common/stream/libstream \
- ../../../common/utils/libmcrypt \
+ NATIVE_WIN32?../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../gdk/libbat \
+ NATIVE_WIN32?../../../common/stream/libstream \
+ NATIVE_WIN32?../../../common/utils/libmcrypt \
$(PTHREAD_LIBS) \
$(openssl_LIBS) $(MATH_LIBS)
}
diff --git a/sql/backends/monet5/UDF/capi/Makefile.ag
b/sql/backends/monet5/UDF/capi/Makefile.ag
--- a/sql/backends/monet5/UDF/capi/Makefile.ag
+++ b/sql/backends/monet5/UDF/capi/Makefile.ag
@@ -24,9 +24,9 @@ lib__capi = {
MODULE
DIR = libdir/monetdb5
SOURCES = capi.c capi.h cheader.h cheader.text.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
- ../../../../../gdk/libbat \
- $(MALLOC_LIBS)
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../../gdk/libbat \
+ $(MALLOC_LIBS)
}
headers_cudf_mal = {
diff --git a/sql/backends/monet5/UDF/pyapi/Makefile.ag
b/sql/backends/monet5/UDF/pyapi/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi/Makefile.ag
@@ -26,9 +26,9 @@ lib__pyapi = {
DIR = libdir/monetdb5
SOURCES = pyapi.c pyapi.h unicode.c unicode.h pytypes.c pytypes.h
type_conversion.c type_conversion.h formatinput.c formatinput.h connection.c
connection.h undef.h pyloader.c emit.h emit.c conversion.c conversion.h
convert_loops.h pyheader.h
XDEPS = $(libpy_LIBDEP)
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
- ../../../../../gdk/libbat \
- $(MALLOC_LIBS) $(libpy_LIBS)
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../../gdk/libbat \
+ $(MALLOC_LIBS) $(libpy_LIBS)
}
headers_pyapi_mal = {
diff --git a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi3/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi3/Makefile.ag
@@ -27,9 +27,9 @@ lib__pyapi3 = {
DIR = libdir/monetdb5
SOURCES = pyapi3.c unicode3.c pytypes3.c type_conversion3.c
formatinput3.c connection3.c pyloader3.c emit3.c conversion3.c
XDEPS = $(libpy3_LIBDEP)
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
- ../../../../../gdk/libbat \
- $(MALLOC_LIBS) $(libpy3_LIBS)
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../../gdk/libbat \
+ $(MALLOC_LIBS) $(libpy3_LIBS)
}
headers_pyapi3_mal = {
diff --git a/sql/backends/monet5/UDF/udf/Makefile.ag
b/sql/backends/monet5/UDF/udf/Makefile.ag
--- a/sql/backends/monet5/UDF/udf/Makefile.ag
+++ b/sql/backends/monet5/UDF/udf/Makefile.ag
@@ -22,8 +22,8 @@ lib__udf = {
MODULE
DIR = libdir/monetdb5
SOURCES = udf.c udf.h udf_impl.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
- ../../../../../gdk/libbat
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../../gdk/libbat
}
headers_mal = {
diff --git a/sql/backends/monet5/generator/Makefile.ag
b/sql/backends/monet5/generator/Makefile.ag
--- a/sql/backends/monet5/generator/Makefile.ag
+++ b/sql/backends/monet5/generator/Makefile.ag
@@ -23,8 +23,8 @@ lib__generator = {
MODULE
DIR = libdir/monetdb5
SOURCES = generator.c generator.h
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat
+ LIBS = NATIVE_WIN32?../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../gdk/libbat
}
headers_mal = {
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -25,8 +25,9 @@ lib__vault = {
MODULE
DIR = libdir/monetdb5
SOURCES = vault.c vault.h
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat $(curl_LIBS)
+ LIBS = NATIVE_WIN32?../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../gdk/libbat \
+ $(curl_LIBS)
}
headers_mal = {
diff --git a/sql/backends/monet5/vaults/bam/Makefile.ag
b/sql/backends/monet5/vaults/bam/Makefile.ag
--- a/sql/backends/monet5/vaults/bam/Makefile.ag
+++ b/sql/backends/monet5/vaults/bam/Makefile.ag
@@ -32,9 +32,9 @@ lib__bam = {
bam_lib.c bam_lib.h \
bam_export.c bam_export.h \
mykstring.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
- ../../../../../gdk/libbat \
- $(SAMTOOLS_LIBS)
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
+ NATIVE_WIN32?../../../../../gdk/libbat \
+ $(SAMTOOLS_LIBS)
}
headers_mal = {
diff --git a/sql/backends/monet5/vaults/fits/Makefile.ag
b/sql/backends/monet5/vaults/fits/Makefile.ag
--- a/sql/backends/monet5/vaults/fits/Makefile.ag
+++ b/sql/backends/monet5/vaults/fits/Makefile.ag
@@ -26,7 +26,7 @@ lib__fits = {
MODULE
DIR = libdir/monetdb5
SOURCES = fits.c fits.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
$(cfitsio_LIBS)
}
diff --git a/sql/backends/monet5/vaults/lidar/Makefile.ag
b/sql/backends/monet5/vaults/lidar/Makefile.ag
--- a/sql/backends/monet5/vaults/lidar/Makefile.ag
+++ b/sql/backends/monet5/vaults/lidar/Makefile.ag
@@ -26,7 +26,7 @@ lib__lidar = {
MODULE
DIR = libdir/monetdb5
SOURCES = lidar.c lidar.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
$(LIBLAS_LIBS)
}
diff --git a/sql/backends/monet5/vaults/netcdf/Makefile.ag
b/sql/backends/monet5/vaults/netcdf/Makefile.ag
--- a/sql/backends/monet5/vaults/netcdf/Makefile.ag
+++ b/sql/backends/monet5/vaults/netcdf/Makefile.ag
@@ -26,7 +26,7 @@ lib__netcdf = {
MODULE
DIR = libdir/monetdb5
SOURCES = netcdf.c netcdf_vault.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
$(netcdf_LIBS)
}
diff --git a/sql/backends/monet5/vaults/shp/Makefile.ag
b/sql/backends/monet5/vaults/shp/Makefile.ag
--- a/sql/backends/monet5/vaults/shp/Makefile.ag
+++ b/sql/backends/monet5/vaults/shp/Makefile.ag
@@ -28,7 +28,7 @@ lib__shp = {
MODULE
DIR = libdir/monetdb5
SOURCES = shp.c shp.h
- LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ LIBS = NATIVE_WIN32?../../../../../monetdb5/tools/libmonetdb5 \
$(GDAL_LIBS)
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
