update dev300-m58
[ooovba.git] / berkeleydb / db-4.7.25.patch
blob30f252ef589c8553da3a17c997bb0b61c8c7ba6f
1 --- misc/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:42:40.000000000 +0200
2 +++ misc/build/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:39:25.000000000 +0200
3 @@ -1 +1,35 @@
4 -dummy
5 +PRJ=..$/..$/..$/..$/..
7 +PRJNAME=berkeleydb
8 +TARGET=btree
10 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
12 +.INCLUDE : settings.mk
14 +INCPRE+=..$/build_windows ..$/
15 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
17 +SLOFILES= \
18 + $(SLO)$/bt_compact.obj \
19 + $(SLO)$/bt_compare.obj \
20 + $(SLO)$/bt_conv.obj \
21 + $(SLO)$/bt_curadj.obj \
22 + $(SLO)$/bt_cursor.obj \
23 + $(SLO)$/bt_delete.obj \
24 + $(SLO)$/bt_method.obj \
25 + $(SLO)$/bt_open.obj \
26 + $(SLO)$/bt_put.obj \
27 + $(SLO)$/bt_rec.obj \
28 + $(SLO)$/bt_reclaim.obj \
29 + $(SLO)$/bt_recno.obj \
30 + $(SLO)$/bt_rsearch.obj \
31 + $(SLO)$/bt_search.obj \
32 + $(SLO)$/bt_split.obj \
33 + $(SLO)$/bt_stat.obj \
34 + $(SLO)$/bt_upgrade.obj \
35 + $(SLO)$/bt_verify.obj \
36 + $(SLO)$/btree_auto.obj
38 +.INCLUDE : target.mk
40 --- misc/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:42:40.000000000 +0200
41 +++ misc/build/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:39:25.000000000 +0200
42 @@ -1 +1,16 @@
43 -dummy
44 +PRJ=..$/..$/..$/..$/..
46 +PRJNAME=berkeleydb
47 +TARGET=clib
49 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
51 +.INCLUDE : settings.mk
53 +INCPRE+=..$/build_windows ..$/dbinc ..$/
54 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
56 +SLOFILES= $(SLO)$/strsep.obj
58 +.INCLUDE : target.mk
60 --- misc/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:42:40.000000000 +0200
61 +++ misc/build/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:39:25.000000000 +0200
62 @@ -1 +1,31 @@
63 -dummy
64 +PRJ=..$/..$/..$/..$/..
66 +PRJNAME=berkeleydb
67 +TARGET=common
69 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
71 +.INCLUDE : settings.mk
73 +INCPRE+=..$/build_windows ..$/
74 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
76 +SLOFILES= \
77 + $(SLO)$/crypto_stub.obj \
78 + $(SLO)$/db_byteorder.obj \
79 + $(SLO)$/db_err.obj \
80 + $(SLO)$/db_getlong.obj \
81 + $(SLO)$/db_idspace.obj \
82 + $(SLO)$/db_log2.obj \
83 + $(SLO)$/db_shash.obj \
84 + $(SLO)$/dbt.obj \
85 + $(SLO)$/mkpath.obj \
86 + $(SLO)$/openflags.obj \
87 + $(SLO)$/os_method.obj \
88 + $(SLO)$/util_cache.obj \
89 + $(SLO)$/util_log.obj \
90 + $(SLO)$/util_sig.obj \
91 + $(SLO)$/zerofill.obj
93 +.INCLUDE : target.mk
95 --- misc/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:42:40.000000000 +0200
96 +++ misc/build/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:39:25.000000000 +0200
97 @@ -1 +1,27 @@
98 -dummy
99 +PRJ=..$/..$/..$/..$/..
101 +PRJNAME=berkeleydb
102 +TARGET=cxx
104 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
106 +.INCLUDE : settings.mk
108 +INCPRE+=..$/build_windows ..$/
109 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
111 +SLOFILES= \
112 + $(SLO)$/cxx_db.obj \
113 + $(SLO)$/cxx_dbc.obj \
114 + $(SLO)$/cxx_dbt.obj \
115 + $(SLO)$/cxx_env.obj \
116 + $(SLO)$/cxx_except.obj \
117 + $(SLO)$/cxx_lock.obj \
118 + $(SLO)$/cxx_logc.obj \
119 + $(SLO)$/cxx_mpool.obj \
120 + $(SLO)$/cxx_multi.obj \
121 + $(SLO)$/cxx_seq.obj \
122 + $(SLO)$/cxx_txn.obj
124 +.INCLUDE : target.mk
126 --- misc/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:42:40.000000000 +0200
127 +++ misc/build/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:39:25.000000000 +0200
128 @@ -1 +1,47 @@
129 -dummy
130 +PRJ=..$/..$/..$/..$/..
132 +PRJNAME=berkeleydb
133 +TARGET=db_src
135 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
137 +.INCLUDE : settings.mk
139 +INCPRE+=..$/build_windows ..$/
140 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
142 +SLOFILES= \
143 + $(SLO)$/crdel_auto.obj \
144 + $(SLO)$/crdel_rec.obj \
145 + $(SLO)$/db.obj \
146 + $(SLO)$/db_am.obj \
147 + $(SLO)$/db_auto.obj \
148 + $(SLO)$/db_cam.obj \
149 + $(SLO)$/db_cds.obj \
150 + $(SLO)$/db_conv.obj \
151 + $(SLO)$/db_dispatch.obj \
152 + $(SLO)$/db_dup.obj \
153 + $(SLO)$/db_iface.obj \
154 + $(SLO)$/db_join.obj \
155 + $(SLO)$/db_meta.obj \
156 + $(SLO)$/db_method.obj \
157 + $(SLO)$/db_open.obj \
158 + $(SLO)$/db_overflow.obj \
159 + $(SLO)$/db_ovfl_vrfy.obj \
160 + $(SLO)$/db_pr.obj \
161 + $(SLO)$/db_rec.obj \
162 + $(SLO)$/db_reclaim.obj \
163 + $(SLO)$/db_remove.obj \
164 + $(SLO)$/db_rename.obj \
165 + $(SLO)$/db_ret.obj \
166 + $(SLO)$/db_setid.obj \
167 + $(SLO)$/db_setlsn.obj \
168 + $(SLO)$/db_stati.obj \
169 + $(SLO)$/db_truncate.obj \
170 + $(SLO)$/db_upg.obj \
171 + $(SLO)$/db_upg_opd.obj \
172 + $(SLO)$/db_vrfy.obj \
173 + $(SLO)$/db_vrfyutil.obj
175 +.INCLUDE: target.mk
177 --- misc/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:42:40.000000000 +0200
178 +++ misc/build/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:39:25.000000000 +0200
179 @@ -1 +1,147 @@
180 -dummy
181 +DB_4_7 {
182 + global:
183 +__bam_adj_read;
184 +__bam_cadjust_read;
185 +__bam_cdel_read;
186 +__bam_curadj_read;
187 +__bam_merge_44_read;
188 +__bam_merge_read;
189 +__bam_pgno_read;
190 +__bam_relink_read;
191 +__bam_relink_43_read;
192 +__bam_repl_read;
193 +__bam_root_read;
194 +__bam_rcuradj_read;
195 +__bam_rsplit_read;
196 +__bam_split_read;
197 +__config_split;
198 +__crdel_inmem_create_read;
199 +__crdel_inmem_rename_read;
200 +__crdel_inmem_remove_read;
201 +__crdel_metasub_read;
202 +__db_add_recovery_int;
203 +__db_addrem_read;
204 +__db_big_read;
205 +__db_cksum_read;
206 +__db_dbm_close;
207 +__db_dbm_delete;
208 +__db_dbm_fetch;
209 +__db_dbm_firstkey;
210 +__db_dbm_init;
211 +__db_dbm_nextkey;
212 +__db_dbm_store;
213 +__db_debug_read;
214 +__db_dispatch;
215 +__db_dumptree;
216 +__db_hcreate;
217 +__db_hdestroy;
218 +__db_hsearch;
219 +__db_idspace;
220 +__db_mkpath;
221 +__db_ndbm_clearerr;
222 +__db_ndbm_close;
223 +__db_ndbm_delete;
224 +__db_ndbm_dirfno;
225 +__db_ndbm_error;
226 +__db_ndbm_fetch;
227 +__db_ndbm_firstkey;
228 +__db_ndbm_nextkey;
229 +__db_ndbm_open;
230 +__db_ndbm_pagfno;
231 +__db_ndbm_rdonly;
232 +__db_ndbm_store;
233 +__db_noop_read;
234 +__db_pg_alloc_42_read;
235 +__db_pg_alloc_read;
236 +__db_pg_free_42_read;
237 +__db_pg_free_read;
238 +__db_pg_freedata_42_read;
239 +__db_pg_freedata_read;
240 +__db_pg_init_read;
241 +__db_pg_sort_read;
242 +__db_pr_callback;
243 +__db_relink_42_read;
244 +__db_rpath;
245 +__db_getlong;
246 +__db_getulong;
247 +__db_ovref_read;
248 +__dbreg_register_read;
249 +__fop_create_read;
250 +__fop_file_remove_read;
251 +__fop_remove_read;
252 +__fop_rename_read;
253 +__fop_write_read;
254 +__ham_chgpg_read;
255 +__ham_copypage_read;
256 +__ham_curadj_read;
257 +__ham_groupalloc_42_read;
258 +__ham_groupalloc_read;
259 +__ham_insdel_read;
260 +__ham_metagroup_42_read;
261 +__ham_metagroup_read;
262 +__ham_newpage_read;
263 +__ham_replace_read;
264 +__ham_splitdata_read;
265 +__lock_list_print;
266 +__os_abspath;
267 +__os_calloc;
268 +__os_closehandle;
269 +__os_ctime;
270 +__os_dirfree;
271 +__os_dirlist;
272 +__os_free;
273 +__os_fsync;
274 +__os_getenv;
275 +__os_mkdir;
276 +__os_open;
277 +__os_read;
278 +__os_rename;
279 +__os_strdup;
280 +__os_unlink;
281 +__os_write;
282 +__os_yield;
283 +__os_id;
284 +__qam_add_read;
285 +__qam_del_read;
286 +__qam_delext_read;
287 +__qam_incfirst_read;
288 +__qam_mvptr_read;
289 +__txn_ckp_read;
290 +__txn_ckp_42_read;
291 +__txn_child_read;
292 +__txn_recycle_read;
293 +__txn_regop_42_read;
294 +__txn_regop_read;
295 +__txn_xa_regop_read;
296 +db_create;
297 +db_env_create;
298 +db_env_set_func_close;
299 +db_env_set_func_dirfree;
300 +db_env_set_func_dirlist;
301 +db_env_set_func_exists;
302 +db_env_set_func_file_map;
303 +db_env_set_func_free;
304 +db_env_set_func_fsync;
305 +db_env_set_func_ftruncate;
306 +db_env_set_func_ioinfo;
307 +db_env_set_func_malloc;
308 +db_env_set_func_open;
309 +db_env_set_func_pread;
310 +db_env_set_func_pwrite;
311 +db_env_set_func_read;
312 +db_env_set_func_realloc;
313 +db_env_set_func_region_map;
314 +db_env_set_func_rename;
315 +db_env_set_func_seek;
316 +db_env_set_func_unlink;
317 +db_env_set_func_write;
318 +db_env_set_func_yield;
319 +db_sequence_create;
320 +db_strerror;
321 +db_version;
322 +db_xa_switch;
323 +log_compare;
325 + local:
326 + *;
327 +};
328 --- misc/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:42:40.000000000 +0200
329 +++ misc/build/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:39:25.000000000 +0200
330 @@ -1 +1,16 @@
331 -dummy
332 +PRJ=..$/..$/..$/..$/..
334 +PRJNAME=berkeleydb
335 +TARGET=dbm
337 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
339 +.INCLUDE : settings.mk
341 +INCPRE+=..$/build_windows ..$/
342 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
344 +SLOFILES= $(SLO)$/dbm.obj
346 +.INCLUDE : target.mk
348 --- misc/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:42:40.000000000 +0200
349 +++ misc/build/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:39:25.000000000 +0200
350 @@ -1 +1,21 @@
351 -dummy
352 +PRJ=..$/..$/..$/..$/..
354 +PRJNAME=berkeleydb
355 +TARGET=dbreg
357 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
359 +.INCLUDE : settings.mk
361 +INCPRE+=..$/build_windows ..$/
362 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
364 +SLOFILES= \
365 + $(SLO)$/dbreg.obj \
366 + $(SLO)$/dbreg_auto.obj \
367 + $(SLO)$/dbreg_rec.obj \
368 + $(SLO)$/dbreg_stat.obj \
369 + $(SLO)$/dbreg_util.obj
371 +.INCLUDE : target.mk
373 --- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 05:03:36.000000000 +0200
374 +++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-21 11:39:25.000000000 +0200
375 @@ -13,7 +13,7 @@
376 libdir= @libdir@
377 docdir= $(prefix)/docs
379 -dmode= 755
380 +dmode= 775
381 emode= 555
382 fmode= 444
384 @@ -56,6 +56,7 @@
385 CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@
387 LDFLAGS= @LDFLAGS@
388 +LDFLAGSVERSION= @LDFLAGSVERSION@
389 LIBS= @LIBSO_LIBS@
390 TEST_LIBS= @TEST_LIBS@
391 LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
392 @@ -733,7 +734,7 @@
394 # Shared C library.
395 $(libso_target): $(C_OBJS)
396 - $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
397 + $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
398 $(RM) -f $(libdb)
399 $(LN) -s .libs/$(libdb_version) $(libdb)
401 --- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200
402 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200
403 @@ -3757,8 +3757,10 @@
404 # Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf
405 # compiler configuration macros, because if we don't, they set CFLAGS
406 # to no optimization and -g, which isn't what we want.
407 -CFLAGS=${CFLAGS-$optimize_debug}
408 -CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
409 +#CFLAGS=${CFLAGS-$optimize_debug}
410 +#CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
411 +CFLAGS="$CFLAGS $optimize_def"
412 +CXXFLAGS="$CXXFLAGS $CFLAGS"
414 # The default compiler is cc (NOT gcc), the default CFLAGS is as specified
415 # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags
416 @@ -12566,7 +12568,8 @@
417 # Check to see if the program is GNU ld. I'd rather use --version,
418 # but apparently some variants of GNU ld only accept -v.
419 # Break only if it was the GNU/non-GNU ld that we prefer.
420 - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
421 +# case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
422 + case `$lt_cv_path_LD -v 2>&1 </dev/null` in
423 *GNU* | *'with BFD'*)
424 test "$with_gnu_ld" != no && break
426 @@ -36624,6 +36627,7 @@
427 JAR!$JAR$ac_delim
428 JAVACFLAGS!$JAVACFLAGS$ac_delim
429 LDFLAGS!$LDFLAGS$ac_delim
430 +LDFLAGSVERSION!$LDFLAGSVERSION$ac_delim
431 LIBCSO_LIBS!$LIBCSO_LIBS$ac_delim
432 LIBJSO_LIBS!$LIBJSO_LIBS$ac_delim
433 LIBSO_LIBS!$LIBSO_LIBS$ac_delim
434 @@ -36655,7 +36659,7 @@
435 DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim
436 _ACEOF
438 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
439 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
440 break
441 elif $ac_last_try; then
442 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
443 --- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200
444 +++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-21 11:39:25.000000000 +0200
445 @@ -1700,7 +1700,9 @@
446 # We need an absolute path.
447 case $dir in
448 [\\/]* | [A-Za-z]:[\\/]*) ;;
449 - *)
450 + # or $ORIGIN altenatively
451 + *\$ORIGIN*) ;;
452 + *)
453 $echo "$modename: only absolute run-paths are allowed" 1>&2
454 exit $EXIT_FAILURE
456 --- misc/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:42:40.000000000 +0200
457 +++ misc/build/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:39:25.000000000 +0200
458 @@ -1 +1,29 @@
459 -dummy
460 +PRJ=..$/..$/..$/..$/..
462 +PRJNAME=berkeleydb
463 +TARGET=env
465 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
467 +.INCLUDE : settings.mk
469 +INCPRE+=..$/build_windows ..$/
470 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
472 +SLOFILES= \
473 + $(SLO)$/env_alloc.obj \
474 + $(SLO)$/env_config.obj \
475 + $(SLO)$/env_failchk.obj \
476 + $(SLO)$/env_file.obj \
477 + $(SLO)$/env_globals.obj \
478 + $(SLO)$/env_method.obj \
479 + $(SLO)$/env_name.obj \
480 + $(SLO)$/env_open.obj \
481 + $(SLO)$/env_recover.obj \
482 + $(SLO)$/env_region.obj \
483 + $(SLO)$/env_register.obj \
484 + $(SLO)$/env_sig.obj \
485 + $(SLO)$/env_stat.obj
487 +.INCLUDE : target.mk
489 --- misc/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:42:40.000000000 +0200
490 +++ misc/build/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:39:26.000000000 +0200
491 @@ -1 +1,20 @@
492 -dummy
493 +PRJ=..$/..$/..$/..$/..
495 +PRJNAME=berkeleydb
496 +TARGET=fileops
498 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
500 +.INCLUDE : settings.mk
502 +INCPRE+=..$/build_windows ..$/
503 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
505 +SLOFILES= \
506 + $(SLO)$/fileops_auto.obj \
507 + $(SLO)$/fop_basic.obj \
508 + $(SLO)$/fop_rec.obj \
509 + $(SLO)$/fop_util.obj
511 +.INCLUDE : target.mk
513 --- misc/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:42:40.000000000 +0200
514 +++ misc/build/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:39:26.000000000 +0200
515 @@ -1 +1,30 @@
516 -dummy
517 +PRJ=..$/..$/..$/..$/..
519 +PRJNAME=berkeleydb
520 +TARGET=hash
522 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
524 +.INCLUDE : settings.mk
526 +INCPRE+=..$/build_windows ..$/
527 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
529 +SLOFILES= \
530 + $(SLO)$/hash.obj \
531 + $(SLO)$/hash_auto.obj \
532 + $(SLO)$/hash_conv.obj \
533 + $(SLO)$/hash_dup.obj \
534 + $(SLO)$/hash_func.obj \
535 + $(SLO)$/hash_meta.obj \
536 + $(SLO)$/hash_method.obj \
537 + $(SLO)$/hash_open.obj \
538 + $(SLO)$/hash_page.obj \
539 + $(SLO)$/hash_rec.obj \
540 + $(SLO)$/hash_reclaim.obj \
541 + $(SLO)$/hash_stat.obj \
542 + $(SLO)$/hash_upgrade.obj \
543 + $(SLO)$/hash_verify.obj
545 +.INCLUDE : target.mk
547 --- misc/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:42:40.000000000 +0200
548 +++ misc/build/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:39:26.000000000 +0200
549 @@ -1 +1,18 @@
550 -dummy
551 +PRJ=..$/..$/..$/..$/..
553 +PRJNAME=berkeleydb
554 +TARGET=hmac
556 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
558 +.INCLUDE : settings.mk
560 +INCPRE+=..$/build_windows ..$/
561 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
563 +SLOFILES= \
564 + $(SLO)$/hmac.obj \
565 + $(SLO)$/sha1.obj
567 +.INCLUDE : target.mk
569 --- misc/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:42:40.000000000 +0200
570 +++ misc/build/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:39:26.000000000 +0200
571 @@ -1 +1,16 @@
572 -dummy
573 +PRJ=..$/..$/..$/..$/..
575 +PRJNAME=berkeleydb
576 +TARGET=hsearch
578 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
580 +.INCLUDE : settings.mk
582 +INCPRE+=..$/build_windows ..$/
583 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
585 +SLOFILES= $(SLO)$/hsearch.obj
587 +.INCLUDE : target.mk
589 --- misc/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:42:40.000000000 +0200
590 +++ misc/build/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:39:26.000000000 +0200
591 @@ -1 +1,26 @@
592 -dummy
593 +PRJ=..$/..$/..$/..$/..
595 +PRJNAME=berkeleydb
596 +TARGET=lock
598 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
600 +.INCLUDE : settings.mk
602 +INCPRE+=..$/build_windows ..$/
603 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
605 +SLOFILES= \
606 + $(SLO)$/lock.obj \
607 + $(SLO)$/lock_deadlock.obj \
608 + $(SLO)$/lock_failchk.obj \
609 + $(SLO)$/lock_id.obj \
610 + $(SLO)$/lock_list.obj \
611 + $(SLO)$/lock_method.obj \
612 + $(SLO)$/lock_region.obj \
613 + $(SLO)$/lock_stat.obj \
614 + $(SLO)$/lock_timer.obj \
615 + $(SLO)$/lock_util.obj
617 +.INCLUDE : target.mk
619 --- misc/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:42:40.000000000 +0200
620 +++ misc/build/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:39:26.000000000 +0200
621 @@ -1 +1,24 @@
622 -dummy
623 +PRJ=..$/..$/..$/..$/..
625 +PRJNAME=berkeleydb
626 +TARGET=log
628 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
630 +.INCLUDE : settings.mk
632 +INCPRE+=..$/build_windows ..$/
633 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
635 +SLOFILES= \
636 + $(SLO)$/log.obj \
637 + $(SLO)$/log_archive.obj \
638 + $(SLO)$/log_compare.obj \
639 + $(SLO)$/log_debug.obj \
640 + $(SLO)$/log_get.obj \
641 + $(SLO)$/log_method.obj \
642 + $(SLO)$/log_put.obj \
643 + $(SLO)$/log_stat.obj
645 +.INCLUDE : target.mk
647 --- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200
648 +++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200
649 @@ -1 +1,80 @@
650 -dummy
651 +PRJ=..$/..$/..$/..
652 +PRJNAME=libdb47
653 +TARGET=libdb47
654 +USE_DEFFILE=true
656 +.INCLUDE : settings.mk
657 +CFLAGS+=-GS -EHsc -Gy
659 +#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
660 +.IF "$(USE_SHELL)"!="4nt"
661 +BUILD_ACTION_SEP=;
662 +.ELSE # "$(USE_SHELL)"!="4nt"
663 +BUILD_ACTION_SEP=^
664 +.ENDIF # "$(USE_SHELL)"!="4nt"
666 +CHILDREN= \
667 + btree clib common cxx \
668 + db dbm dbreg env fileops \
669 + hash hmac hsearch lock \
670 + log mp mutex os os_windows \
671 + qam rep repmgr sequence \
672 + txn xa
674 +LIB1TARGET= $(SLB)$/$(TARGET).lib
675 +LIB1FILES= \
676 + $(SLB)$/btree.lib \
677 + $(SLB)$/clib.lib \
678 + $(SLB)$/common.lib \
679 + $(SLB)$/cxx.lib \
680 + $(SLB)$/db_src.lib \
681 + $(SLB)$/dbm.lib \
682 + $(SLB)$/dbreg.lib \
683 + $(SLB)$/env.lib \
684 + $(SLB)$/fileops.lib \
685 + $(SLB)$/hash.lib \
686 + $(SLB)$/hmac.lib \
687 + $(SLB)$/hsearch.lib \
688 + $(SLB)$/lock.lib \
689 + $(SLB)$/log.lib \
690 + $(SLB)$/mp.lib \
691 + $(SLB)$/mutex.lib \
692 + $(SLB)$/os.lib \
693 + $(SLB)$/os_windows.lib \
694 + $(SLB)$/qam.lib \
695 + $(SLB)$/rep.lib \
696 + $(SLB)$/repmgr.lib \
697 + $(SLB)$/sequence.lib \
698 + $(SLB)$/txn.lib \
699 + $(SLB)$/xa.lib
701 +SHL1LIBS=$(LIB1TARGET)
702 +SHL1STDLIBS = $(WS2_32LIB) $(ADVAPI32LIB)
703 +SHL1TARGET = $(TARGET)
704 +SHL1DEF = $(MISC)$/$(SHL1TARGET).def
705 +SHL1IMPLIB = $(SHL1TARGET)
706 +SHL1LIBS = $(SLB)$/$(TARGET).lib
707 +SHL1DEPN = $(CHILDREN)
709 +#The following line prevents that the resource file is automatically generated
710 +use_shl_versions:=
711 +#use the berkeley's resource file
712 +RCFILES = build_windows$/libdb.rc
713 +SHL1RES= $(RES)$/libdb47.res
715 +#DEF1NAME=$(SHL1TARGET)
716 +#DEF1EXPORTFILE=$(TARGET).dxp
718 +# dmake builds the first rule
719 +ALLTAR : $(CHILDREN)
721 +$(CHILDREN) .PHONY :
722 + cd $@ $(BUILD_ACTION_SEP) $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
724 +.INCLUDE : target.mk
726 +$(MISC)$/$(SHL1TARGET).def : build_windows$/libdb.def
727 + $(COPY) $< $@
729 + #$(DUMPBIN) -DIRECTIVES $(SLB)$/$(TARGET).lib | $(GREP) EXPORT: | $(GREP) -v ",DATA" | $(SED) "s/.*EXPORT://" >> $@
731 --- misc/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:42:40.000000000 +0200
732 +++ misc/build/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:39:26.000000000 +0200
733 @@ -1 +1,31 @@
734 -dummy
735 +PRJ=..$/..$/..$/..$/..
737 +PRJNAME=berkeleydb
738 +TARGET=mp
740 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
742 +.INCLUDE : settings.mk
744 +INCPRE+=..$/build_windows ..$/
745 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
747 +SLOFILES= \
748 + $(SLO)$/mp_alloc.obj \
749 + $(SLO)$/mp_bh.obj \
750 + $(SLO)$/mp_fget.obj \
751 + $(SLO)$/mp_fmethod.obj \
752 + $(SLO)$/mp_fopen.obj \
753 + $(SLO)$/mp_fput.obj \
754 + $(SLO)$/mp_fset.obj \
755 + $(SLO)$/mp_method.obj \
756 + $(SLO)$/mp_mvcc.obj \
757 + $(SLO)$/mp_region.obj \
758 + $(SLO)$/mp_register.obj \
759 + $(SLO)$/mp_resize.obj \
760 + $(SLO)$/mp_stat.obj \
761 + $(SLO)$/mp_sync.obj \
762 + $(SLO)$/mp_trickle.obj
764 +.INCLUDE : target.mk
766 --- misc/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:42:40.000000000 +0200
767 +++ misc/build/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:39:26.000000000 +0200
768 @@ -1 +1,23 @@
769 -dummy
771 +PRJ=..$/..$/..$/..$/..
773 +PRJNAME=berkeleydb
774 +TARGET=mutex
776 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
778 +.INCLUDE : settings.mk
780 +INCPRE+=-I..$/build_windows -I..$/ -I$(COMPATH)$/include $(PSDKINC)
781 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
783 +SLOFILES= \
784 + $(SLO)$/mut_alloc.obj \
785 + $(SLO)$/mut_failchk.obj \
786 + $(SLO)$/mut_method.obj \
787 + $(SLO)$/mut_region.obj \
788 + $(SLO)$/mut_stat.obj \
789 + $(SLO)$/mut_win32.obj
791 +.INCLUDE : target.mk
793 --- misc/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:42:40.000000000 +0200
794 +++ misc/build/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:39:26.000000000 +0200
795 @@ -1 +1,26 @@
796 -dummy
797 +PRJ=..$/..$/..$/..$/..
799 +PRJNAME=berkeleydb
800 +TARGET=os
802 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
804 +.INCLUDE : settings.mk
806 +INCPRE+=..$/build_windows ..$/
807 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
809 +SLOFILES= \
810 + $(SLO)$/os_abort.obj \
811 + $(SLO)$/os_addrinfo.obj \
812 + $(SLO)$/os_alloc.obj \
813 + $(SLO)$/os_ctime.obj \
814 + $(SLO)$/os_pid.obj \
815 + $(SLO)$/os_root.obj \
816 + $(SLO)$/os_rpath.obj \
817 + $(SLO)$/os_stack.obj \
818 + $(SLO)$/os_tmpdir.obj \
819 + $(SLO)$/os_uid.obj
821 +.INCLUDE : target.mk
823 --- misc/db-4.7.25.NC/os/os_fsync.c 2008-05-06 05:03:37.000000000 +0200
824 +++ misc/build/db-4.7.25.NC/os/os_fsync.c 2009-07-21 11:42:03.000000000 +0200
825 @@ -79,13 +79,17 @@
826 ret = DB_GLOBAL(j_fsync)(fhp->fd);
827 else {
828 #if defined(F_FULLFSYNC)
829 +/* When running OOo on MacOS using an NFS mounted disk, fcntl failed with errno
830 + ENOTTY (25). Since full sync only works on HFS, FAT and UDF (according to the
831 + man page) and also is more time consuming we just use the fallback.
832 RETRY_CHK((fcntl(fhp->fd, F_FULLFSYNC, 0)), ret);
833 - /*
834 +*/ /*
835 * On OS X, F_FULLSYNC only works on HFS+, so we need to fall
836 * back to regular fsync on other filesystems.
838 - if (ret == ENOTSUP)
839 - RETRY_CHK((fsync(fhp->fd)), ret);
840 +/* if (ret == ENOTSUP)
842 + RETRY_CHK((fsync(fhp->fd)), ret);
843 #elif defined(HAVE_QNX)
844 ret = __qnx_fsync(fhp);
845 #elif defined(HAVE_FDATASYNC)
846 --- misc/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:42:40.000000000 +0200
847 +++ misc/build/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:39:26.000000000 +0200
848 @@ -1 +1,37 @@
849 -dummy
850 +PRJ=..$/..$/..$/..$/..
852 +PRJNAME=berkeleydb
853 +TARGET=os_windows
855 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
857 +.INCLUDE : settings.mk
859 +INCPRE+=..$/build_windows ..$/
860 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
862 +SLOFILES= \
863 + $(SLO)$/os_abs.obj \
864 + $(SLO)$/os_clock.obj \
865 + $(SLO)$/os_config.obj \
866 + $(SLO)$/os_cpu.obj \
867 + $(SLO)$/os_dir.obj \
868 + $(SLO)$/os_errno.obj \
869 + $(SLO)$/os_fid.obj \
870 + $(SLO)$/os_flock.obj \
871 + $(SLO)$/os_fsync.obj \
872 + $(SLO)$/os_getenv.obj \
873 + $(SLO)$/os_handle.obj \
874 + $(SLO)$/os_map.obj \
875 + $(SLO)$/os_mkdir.obj \
876 + $(SLO)$/os_open.obj \
877 + $(SLO)$/os_rename.obj \
878 + $(SLO)$/os_rw.obj \
879 + $(SLO)$/os_seek.obj \
880 + $(SLO)$/os_stat.obj \
881 + $(SLO)$/os_truncate.obj \
882 + $(SLO)$/os_unlink.obj \
883 + $(SLO)$/os_yield.obj \
885 +.INCLUDE : target.mk
887 --- misc/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:42:40.000000000 +0200
888 +++ misc/build/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:39:26.000000000 +0200
889 @@ -1 +1,26 @@
890 -dummy
891 +PRJ=..$/..$/..$/..$/..
893 +PRJNAME=berkeleydb
894 +TARGET=qam
896 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
898 +.INCLUDE : settings.mk
900 +INCPRE+=..$/build_windows ..$/
901 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
903 +SLOFILES= \
904 + $(SLO)$/qam.obj \
905 + $(SLO)$/qam_auto.obj \
906 + $(SLO)$/qam_conv.obj \
907 + $(SLO)$/qam_files.obj \
908 + $(SLO)$/qam_method.obj \
909 + $(SLO)$/qam_open.obj \
910 + $(SLO)$/qam_rec.obj \
911 + $(SLO)$/qam_stat.obj \
912 + $(SLO)$/qam_upgrade.obj \
913 + $(SLO)$/qam_verify.obj
915 +.INCLUDE : target.mk
917 --- misc/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:42:40.000000000 +0200
918 +++ misc/build/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:39:26.000000000 +0200
919 @@ -1 +1,27 @@
920 -dummy
921 +PRJ=..$/..$/..$/..$/..
923 +PRJNAME=berkeleydb
924 +TARGET=rep
926 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
928 +.INCLUDE : settings.mk
930 +INCPRE+=..$/build_windows ..$/
931 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
933 +SLOFILES= \
934 + $(SLO)$/rep_auto.obj \
935 + $(SLO)$/rep_backup.obj \
936 + $(SLO)$/rep_elect.obj \
937 + $(SLO)$/rep_lease.obj \
938 + $(SLO)$/rep_log.obj \
939 + $(SLO)$/rep_method.obj \
940 + $(SLO)$/rep_record.obj \
941 + $(SLO)$/rep_region.obj \
942 + $(SLO)$/rep_stat.obj \
943 + $(SLO)$/rep_util.obj \
944 + $(SLO)$/rep_verify.obj
946 +.INCLUDE : target.mk
948 --- misc/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:42:40.000000000 +0200
949 +++ misc/build/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:39:26.000000000 +0200
950 @@ -1 +1,26 @@
951 -dummy
952 +PRJ=..$/..$/..$/..$/..
954 +PRJNAME=berkeleydb
955 +TARGET=repmgr
957 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
959 +.INCLUDE : settings.mk
961 +INCPRE+=..$/build_windows ..$/
962 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
964 +SLOFILES= \
965 + $(SLO)$/repmgr_auto.obj \
966 + $(SLO)$/repmgr_elect.obj \
967 + $(SLO)$/repmgr_method.obj \
968 + $(SLO)$/repmgr_msg.obj \
969 + $(SLO)$/repmgr_net.obj \
970 + $(SLO)$/repmgr_queue.obj \
971 + $(SLO)$/repmgr_sel.obj \
972 + $(SLO)$/repmgr_stat.obj \
973 + $(SLO)$/repmgr_util.obj \
974 + $(SLO)$/repmgr_windows.obj
976 +.INCLUDE : target.mk
978 --- misc/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:42:40.000000000 +0200
979 +++ misc/build/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:39:26.000000000 +0200
980 @@ -1 +1,18 @@
981 -dummy
982 +PRJ=..$/..$/..$/..$/..
984 +PRJNAME=berkeleydb
985 +TARGET=sequence
987 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
989 +.INCLUDE : settings.mk
991 +INCPRE+=..$/build_windows ..$/
992 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
994 +SLOFILES= \
995 + $(SLO)$/seq_stat.obj \
996 + $(SLO)$/sequence.obj
998 +.INCLUDE : target.mk
1000 --- misc/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:42:40.000000000 +0200
1001 +++ misc/build/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:39:26.000000000 +0200
1002 @@ -1 +1,26 @@
1003 -dummy
1004 +PRJ=..$/..$/..$/..$/..
1006 +PRJNAME=berkeleydb
1007 +TARGET=txn
1009 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1011 +.INCLUDE : settings.mk
1013 +INCPRE+=..$/build_windows ..$/
1014 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1016 +SLOFILES= \
1017 + $(SLO)$/txn.obj \
1018 + $(SLO)$/txn_auto.obj \
1019 + $(SLO)$/txn_chkpt.obj \
1020 + $(SLO)$/txn_failchk.obj \
1021 + $(SLO)$/txn_method.obj \
1022 + $(SLO)$/txn_rec.obj \
1023 + $(SLO)$/txn_recover.obj \
1024 + $(SLO)$/txn_region.obj \
1025 + $(SLO)$/txn_stat.obj \
1026 + $(SLO)$/txn_util.obj
1028 +.INCLUDE : target.mk
1030 --- misc/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:42:40.000000000 +0200
1031 +++ misc/build/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:39:26.000000000 +0200
1032 @@ -1 +1,19 @@
1033 -dummy
1034 +PRJ=..$/..$/..$/..$/..
1036 +PRJNAME=berkeleydb
1037 +TARGET=xa
1039 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1041 +.INCLUDE : settings.mk
1043 +INCPRE+=..$/build_windows ..$/
1044 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1046 +SLOFILES= \
1047 + $(SLO)$/xa.obj \
1048 + $(SLO)$/xa_db.obj \
1049 + $(SLO)$/xa_map.obj
1051 +.INCLUDE : target.mk