-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathemcc.diff
516 lines (463 loc) · 15.9 KB
/
emcc.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
diff -r a56a47e8992d CMakeLists.txt
--- a/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -74,7 +74,7 @@
set(CMAKE_EXTRA_INCLUDE_FILES "winsock.h")
endif()
endif()
-set(CMAKE_REQUIRED_INCLUDES "/usr/include")
+#set(CMAKE_REQUIRED_INCLUDES "/usr/include")
monetdb_configure_crypto()
monetdb_configure_sizes()
@@ -125,17 +125,6 @@
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-install(TARGETS
- monetdb_config_header
- EXPORT monetdb_config_headerTargets
- COMPONENT monetdbdev)
-
-install(EXPORT monetdb_config_headerTargets
- FILE monetdb_config_headerTargets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT monetdbdev)
-
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb_config.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
diff -r a56a47e8992d clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/clients/mapilib/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
add_library(mapi
- SHARED)
+ STATIC)
# We need to add the public library twice to the target sources, once for
# the build interface and once for the install interface. This is because
@@ -57,28 +57,6 @@
COMPONENT clientdev)
endif()
-install(TARGETS
- mapi
- EXPORT mapiTargets
- RUNTIME
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT client
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
- NAMELINK_COMPONENT clientdev
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- COMPONENT clientdev
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(EXPORT mapiTargets
- FILE mapiTargets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT clientdev)
# vim: set ts=2:sw=2:et
diff -r a56a47e8992d clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c Tue Jun 08 22:11:45 2021 +0200
+++ b/clients/mapilib/mapi.c Wed Jun 09 15:59:48 2021 +0200
@@ -3709,7 +3709,7 @@
}
mid->blk.buf[mid->blk.end + len] = 0;
if (mid->trace) {
- printf("got next block: length:%zd\n", len);
+ printf("got next block: length:%d\n", (int)len);
printf("text:%s\n", mid->blk.buf + mid->blk.end);
}
if (len == 0) { /* add prompt */
diff -r a56a47e8992d clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/clients/odbc/driver/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -11,7 +11,7 @@
endif()
add_library(MonetODBC
- MODULE)
+ STATIC)
target_sources(MonetODBC
PRIVATE
diff -r a56a47e8992d clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/clients/odbc/setup/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBCs
- MODULE)
+STATIC)
target_sources(MonetODBCs
PRIVATE
diff -r a56a47e8992d clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/clients/odbc/winsetup/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBCs
- MODULE)
+STATIC)
target_sources(MonetODBCs
PRIVATE
diff -r a56a47e8992d common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/common/stream/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -13,7 +13,7 @@
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/stream_socket.h>)
add_library(stream
- SHARED)
+ STATIC)
target_sources(stream
PRIVATE
@@ -135,9 +135,3 @@
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT streamdev)
-
-install(EXPORT streamTargets
- FILE streamTargets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT streamdev)
diff -r a56a47e8992d gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/gdk/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -30,7 +30,7 @@
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_calc.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/gdk_cand.h>)
-add_library(bat SHARED)
+add_library(bat STATIC)
target_sources(bat
PRIVATE
@@ -142,9 +142,3 @@
COMPONENT monetdbdev
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT monetdbdev)
-
-install(EXPORT gdkTargets
- FILE gdkTargets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT monetdbdev)
diff -r a56a47e8992d gdk/gdk.h
--- a/gdk/gdk.h Tue Jun 08 22:11:45 2021 +0200
+++ b/gdk/gdk.h Wed Jun 09 15:59:48 2021 +0200
@@ -453,6 +453,9 @@
typedef int64_t lng;
typedef uint64_t ulng;
+// #define SIZEOF_SIZE_T ((int) sizeof(size_t)
+//#define SIZEOF_INT ((int) sizeof(int)
+
#define SIZEOF_OID SIZEOF_SIZE_T
typedef size_t oid;
#define OIDFMT "%zu"
diff -r a56a47e8992d gdk/gdk_logger_old.c
--- a/gdk/gdk_logger_old.c Tue Jun 08 22:11:45 2021 +0200
+++ b/gdk/gdk_logger_old.c Wed Jun 09 15:59:48 2021 +0200
@@ -252,7 +252,7 @@
if ((nr = mnstr_read(l->log, buf, 1, len)) != (ssize_t) len) {
buf[len - 1] = 0;
- TRC_CRITICAL(GDK, "couldn't read name (%s) %zd\n", buf, nr);
+ TRC_CRITICAL(GDK, "couldn't read name (%s) %d\n", buf, (int)nr);
GDKfree(buf);
return NULL;
}
diff -r a56a47e8992d gdk/gdk_storage.c
--- a/gdk/gdk_storage.c Tue Jun 08 22:11:45 2021 +0200
+++ b/gdk/gdk_storage.c Wed Jun 09 15:59:48 2021 +0200
@@ -463,19 +463,19 @@
(unsigned) MIN(1 << 30, size));
if (ret < 0) {
err = -1;
- GDKsyserror("GDKsave: error %zd"
+ GDKsyserror("GDKsave: error %d"
" on: name=%s, ext=%s, "
- "mode=%d\n", ret, nme,
+ "mode=%d\n", (int)ret, nme,
ext ? ext : "", (int) mode);
break;
}
size -= ret;
buf = (void *) ((char *) buf + ret);
TRC_DEBUG(IO_, "Write(fd %d, buf %p"
- ", size %u) = %zd\n",
+ ", size %u) = %d\n",
fd, buf,
(unsigned) MIN(1 << 30, size),
- ret);
+ (int)ret);
}
if (dosync && !(GDKdebug & NOSYNCMASK)
#if defined(NATIVE_WIN32)
@@ -542,13 +542,13 @@
for (n_expected = (ssize_t) size; n_expected > 0; n_expected -= n) {
n = read(fd, dst, (unsigned) MIN(1 << 30, n_expected));
if (n < 0)
- GDKsyserror("GDKload: cannot read: name=%s, ext=%s, %zu bytes missing.\n", nme, ext ? ext : "", (size_t) n_expected);
+ GDKsyserror("GDKload: cannot read: name=%s, ext=%s, %u bytes missing.\n", nme, ext ? ext : "", (int) n_expected);
#ifndef __COVERITY__
/* Coverity doesn't seem to
* recognize that we're just
* printing the value of ptr,
* not its contents */
- TRC_DEBUG(IO_, "read(dst %p, n_expected %zd, fd %d) = %zd\n", (void *)dst, n_expected, fd, n);
+ TRC_DEBUG(IO_, "read(dst %p, n_expected %d, fd %d) = %d\n", (void *)dst, (int)n_expected, fd, (int)n);
#endif
if (n <= 0)
diff -r a56a47e8992d geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/geom/monetdb5/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
if(GEOS_FOUND)
- add_library(geomodule MODULE)
+ add_library(geomodule STATIC)
set(include_sql_files
40_geom)
diff -r a56a47e8992d monetdb5/extras/mal_optimizer_template/CMakeLists.txt
--- a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
#]]
-add_library(opt_sql_append MODULE)
+add_library(opt_sql_append STATIC)
target_sources(opt_sql_append
PRIVATE
diff -r a56a47e8992d monetdb5/extras/rapi/CMakeLists.txt
--- a/monetdb5/extras/rapi/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/monetdb5/extras/rapi/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
if(LIBR_FOUND)
- add_library(rapi MODULE)
+ add_library(rapi STATIC)
target_sources(rapi
PRIVATE
diff -r a56a47e8992d monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c Tue Jun 08 22:11:45 2021 +0200
+++ b/monetdb5/mal/mal_debugger.c Wed Jun 09 15:59:48 2021 +0200
@@ -226,7 +226,7 @@
static inline char *
local_itoa(ssize_t i, char *buf)
{
- snprintf(buf, 32, "%zd", i);
+ snprintf(buf, 32, "%d", (int)i);
return buf;
}
static inline char *
diff -r a56a47e8992d monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/monetdb5/modules/kernel/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
add_library(kernel OBJECT)
-add_library(microbenchmark MODULE)
+add_library(microbenchmark STATIC)
target_sources(kernel
PRIVATE
diff -r a56a47e8992d monetdb5/scheduler/CMakeLists.txt
--- a/monetdb5/scheduler/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/monetdb5/scheduler/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
#]]
-add_library(run_adder MODULE)
+add_library(run_adder STATIC)
target_sources(run_adder
PRIVATE
run_adder.c)
@@ -33,7 +33,7 @@
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
COMPONENT run_adder)
-add_library(run_isolate MODULE)
+add_library(run_isolate STATIC)
target_sources(run_isolate
PRIVATE
run_isolate.c)
@@ -59,7 +59,7 @@
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
COMPONENT run_isolate)
-add_library(run_memo MODULE)
+add_library(run_memo STATIC)
target_sources(run_memo
PRIVATE
run_memo.c)
diff -r a56a47e8992d monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/monetdb5/tools/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
#]]
-add_library(monetdb5 SHARED
+add_library(monetdb5 STATIC
$<TARGET_OBJECTS:mal>
$<TARGET_OBJECTS:atoms>
$<TARGET_OBJECTS:malmodules>
@@ -69,11 +69,3 @@
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-install(EXPORT monetdb5Targets
- FILE monetdb5Targets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT serverdev)
-
-# vim: set ts=2:sw=2:et
diff -r a56a47e8992d sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -10,8 +10,7 @@
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sql_import.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/sql_import.h>)
-#add_library(sql MODULE)
-add_library(sql SHARED)
+add_library(sql STATIC)
set(include_sql_files
12_url
@@ -149,9 +148,3 @@
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-
-install(EXPORT sqlTargets
- FILE sqlTargets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT monetdbdev)
diff -r a56a47e8992d sql/backends/monet5/UDF/capi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/capi/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/UDF/capi/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -8,7 +8,7 @@
if(CINTEGRATION)
# TODO add code too regenerate the cheader.text.h file
- add_library(capi MODULE)
+ add_library(capi STATIC)
target_sources(capi
PRIVATE
diff -r a56a47e8992d sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
if(HAVE_LIBPY3)
- add_library(pyapi3 MODULE)
+ add_library(pyapi3 STATIC)
target_sources(pyapi3
PRIVATE
diff -r a56a47e8992d sql/backends/monet5/UDF/udf/CMakeLists.txt
--- a/sql/backends/monet5/UDF/udf/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/UDF/udf/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
#]]
-add_library(udf MODULE)
+add_library(udf STATIC)
set(include_sql_files
80_udf)
diff -r a56a47e8992d sql/backends/monet5/generator/CMakeLists.txt
--- a/sql/backends/monet5/generator/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/generator/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
#]]
-add_library(generator MODULE)
+add_library(generator STATIC)
set(include_sql_files
90_generator)
diff -r a56a47e8992d sql/backends/monet5/vaults/fits/CMakeLists.txt
--- a/sql/backends/monet5/vaults/fits/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/vaults/fits/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
if(HAVE_FITS)
- add_library(fits MODULE)
+ add_library(fits STATIC)
set(include_sql_files
72_fits)
diff -r a56a47e8992d sql/backends/monet5/vaults/netcdf/CMakeLists.txt
--- a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -9,7 +9,7 @@
if(NETCDF_FOUND)
# the netcdf library is also called netcdf, so cmake gets confused.
# Give it another name
- add_library(netcdff MODULE)
+ add_library(netcdff STATIC)
set(include_sql_files
74_netcdf)
diff -r a56a47e8992d sql/backends/monet5/vaults/shp/CMakeLists.txt
--- a/sql/backends/monet5/vaults/shp/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/backends/monet5/vaults/shp/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -7,7 +7,7 @@
#]]
if(GDAL_FOUND)
- add_library(shp MODULE)
+ add_library(shp STATIC)
set(include_sql_files
75_shp)
diff -r a56a47e8992d sql/server/sql_scan.c
--- a/sql/server/sql_scan.c Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/server/sql_scan.c Wed Jun 09 15:59:48 2021 +0200
@@ -943,7 +943,7 @@
utf8_putchar(lc, before_cur);
return scanner_token(lc, token);
} else {
- (void)sql_error( c, 2, SQLSTATE(42000) "Unexpected symbol %lc", (wint_t) cur);
+ (void)sql_error( c, 2, SQLSTATE(42000) "Unexpected symbol %ulc", (wint_t) cur);
return LEX_ERROR;
}
}
@@ -1136,7 +1136,7 @@
return scanner_token(lc, '|');
}
}
- (void)sql_error( c, 3, SQLSTATE(42000) "Unexpected symbol (%lc)", (wint_t) cur);
+ (void)sql_error( c, 3, SQLSTATE(42000) "Unexpected symbol (%ulc)", (wint_t) cur);
return LEX_ERROR;
}
diff -r a56a47e8992d sql/storage/store.c
--- a/sql/storage/store.c Tue Jun 08 22:11:45 2021 +0200
+++ b/sql/storage/store.c Wed Jun 09 15:59:48 2021 +0200
@@ -2269,7 +2269,7 @@
file_size = getFileSize(contents);
if (file_size < size) {
- GDKerror("Have to copy %zd bytes but only %zd exist in %s", size, file_size, path);
+ GDKerror("Have to copy %d bytes but only %d exist in %s", (int)size, (int)file_size, path);
goto end;
}
@@ -2292,7 +2292,7 @@
ssize_t nbytes = mnstr_read(contents, buf, 1, chunk);
if (nbytes != chunk) {
char *err = mnstr_error(contents);
- GDKerror("Read only %zd/%zd bytes of component %s: %s", nbytes, chunk, path, err);
+ GDKerror("Read only %d/%d bytes of component %s: %s", (int)nbytes, (int)chunk, path, err);
free(err);
goto end;
}
diff -r a56a47e8992d tools/monetdbe/CMakeLists.txt
--- a/tools/monetdbe/CMakeLists.txt Tue Jun 08 22:11:45 2021 +0200
+++ b/tools/monetdbe/CMakeLists.txt Wed Jun 09 15:59:48 2021 +0200
@@ -11,7 +11,7 @@
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/monetdbe.h>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/monetdbe.h>)
-add_library(monetdbe SHARED)
+add_library(monetdbe STATIC)
add_compile_definitions(COMPILING_MONETDBE)
@@ -91,9 +91,3 @@
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT server
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-install(EXPORT monetdbeTargets
- FILE monetdbeTargets.cmake
- NAMESPACE MonetDB::
- DESTINATION ${EXPORT_TARGET_PATH}
- COMPONENT serverdev)