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
5
+PRJ=..$/..$/..$/..$/..
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
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
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
44
+PRJ=..$/..$/..$/..$/..
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
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
64
+PRJ=..$/..$/..$/..$/..
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
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 \
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
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
99
+PRJ=..$/..$/..$/..$/..
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
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
130
+PRJ=..$/..$/..$/..$/..
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
143
+ $(SLO)$/crdel_auto.obj \
144
+ $(SLO)$/crdel_rec.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
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
187
+__bam_merge_44_read;
191
+__bam_relink_43_read;
198
+__crdel_inmem_create_read;
199
+__crdel_inmem_rename_read;
200
+__crdel_inmem_remove_read;
201
+__crdel_metasub_read;
202
+__db_add_recovery_int;
234
+__db_pg_alloc_42_read;
236
+__db_pg_free_42_read;
238
+__db_pg_freedata_42_read;
239
+__db_pg_freedata_read;
243
+__db_relink_42_read;
248
+__dbreg_register_read;
250
+__fop_file_remove_read;
255
+__ham_copypage_read;
257
+__ham_groupalloc_42_read;
258
+__ham_groupalloc_read;
260
+__ham_metagroup_42_read;
261
+__ham_metagroup_read;
264
+__ham_splitdata_read;
287
+__qam_incfirst_read;
293
+__txn_regop_42_read;
295
+__txn_xa_regop_read;
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;
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
332
+PRJ=..$/..$/..$/..$/..
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
352
+PRJ=..$/..$/..$/..$/..
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
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
377
docdir= $(prefix)/docs
385
CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@
388
+LDFLAGSVERSION= @LDFLAGSVERSION@
390
TEST_LIBS= @TEST_LIBS@
391
LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
395
$(libso_target): $(C_OBJS)
396
- $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
397
+ $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
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 @@
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
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
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.
448
[\\/]* | [A-Za-z]:[\\/]*) ;;
450
+ # or $ORIGIN altenatively
453
$echo "$modename: only absolute run-paths are allowed" 1>&2
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
460
+PRJ=..$/..$/..$/..$/..
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
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
493
+PRJ=..$/..$/..$/..$/..
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
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
517
+PRJ=..$/..$/..$/..$/..
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
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
551
+PRJ=..$/..$/..$/..$/..
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
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
573
+PRJ=..$/..$/..$/..$/..
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
593
+PRJ=..$/..$/..$/..$/..
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
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
623
+PRJ=..$/..$/..$/..$/..
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
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
657
+.INCLUDE : settings.mk
658
+CFLAGS+=-GS -EHsc -Gy
660
+#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
663
+ btree clib common cxx \
664
+ db dbm dbreg env fileops \
665
+ hash hmac hsearch lock \
666
+ log mp mutex os os_windows \
667
+ qam rep repmgr sequence \
670
+LIB1TARGET= $(SLB)$/$(TARGET).lib
672
+ $(SLB)$/btree.lib \
674
+ $(SLB)$/common.lib \
676
+ $(SLB)$/db_src.lib \
678
+ $(SLB)$/dbreg.lib \
680
+ $(SLB)$/fileops.lib \
683
+ $(SLB)$/hsearch.lib \
687
+ $(SLB)$/mutex.lib \
689
+ $(SLB)$/os_windows.lib \
692
+ $(SLB)$/repmgr.lib \
693
+ $(SLB)$/sequence.lib \
697
+SHL1LIBS=$(LIB1TARGET)
698
+SHL1STDLIBS = $(WS2_32LIB) $(ADVAPI32LIB)
699
+SHL1TARGET = $(TARGET)
700
+SHL1DEF = $(MISC)$/$(SHL1TARGET).def
701
+SHL1IMPLIB = $(SHL1TARGET)
702
+SHL1LIBS = $(SLB)$/$(TARGET).lib
703
+SHL1DEPN = $(CHILDREN)
705
+#The following line prevents that the resource file is automatically generated
707
+#use the berkeley's resource file
708
+RCFILES = build_windows$/libdb.rc
709
+SHL1RES= $(RES)$/libdb47.res
711
+#DEF1NAME=$(SHL1TARGET)
712
+#DEF1EXPORTFILE=$(TARGET).dxp
714
+# dmake builds the first rule
715
+ALLTAR : $(CHILDREN)
717
+$(CHILDREN) .PHONY :
718
+ cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
720
+.INCLUDE : target.mk
722
+$(MISC)$/$(SHL1TARGET).def : build_windows$/libdb.def
725
+ #$(DUMPBIN) -DIRECTIVES $(SLB)$/$(TARGET).lib | $(GREP) EXPORT: | $(GREP) -v ",DATA" | $(SED) "s/.*EXPORT://" >> $@
727
--- misc/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:42:40.000000000 +0200
728
+++ misc/build/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:39:26.000000000 +0200
731
+PRJ=..$/..$/..$/..$/..
736
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
738
+.INCLUDE : settings.mk
740
+INCPRE+=..$/build_windows ..$/
741
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
744
+ $(SLO)$/mp_alloc.obj \
745
+ $(SLO)$/mp_bh.obj \
746
+ $(SLO)$/mp_fget.obj \
747
+ $(SLO)$/mp_fmethod.obj \
748
+ $(SLO)$/mp_fopen.obj \
749
+ $(SLO)$/mp_fput.obj \
750
+ $(SLO)$/mp_fset.obj \
751
+ $(SLO)$/mp_method.obj \
752
+ $(SLO)$/mp_mvcc.obj \
753
+ $(SLO)$/mp_region.obj \
754
+ $(SLO)$/mp_register.obj \
755
+ $(SLO)$/mp_resize.obj \
756
+ $(SLO)$/mp_stat.obj \
757
+ $(SLO)$/mp_sync.obj \
758
+ $(SLO)$/mp_trickle.obj
760
+.INCLUDE : target.mk
762
--- misc/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:42:40.000000000 +0200
763
+++ misc/build/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:39:26.000000000 +0200
767
+PRJ=..$/..$/..$/..$/..
772
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
774
+.INCLUDE : settings.mk
776
+INCPRE+=-I..$/build_windows -I..$/ -I$(COMPATH)$/include $(PSDKINC)
777
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
780
+ $(SLO)$/mut_alloc.obj \
781
+ $(SLO)$/mut_failchk.obj \
782
+ $(SLO)$/mut_method.obj \
783
+ $(SLO)$/mut_region.obj \
784
+ $(SLO)$/mut_stat.obj \
785
+ $(SLO)$/mut_win32.obj
787
+.INCLUDE : target.mk
789
--- misc/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:42:40.000000000 +0200
790
+++ misc/build/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:39:26.000000000 +0200
793
+PRJ=..$/..$/..$/..$/..
798
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
800
+.INCLUDE : settings.mk
802
+INCPRE+=..$/build_windows ..$/
803
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
806
+ $(SLO)$/os_abort.obj \
807
+ $(SLO)$/os_addrinfo.obj \
808
+ $(SLO)$/os_alloc.obj \
809
+ $(SLO)$/os_ctime.obj \
810
+ $(SLO)$/os_pid.obj \
811
+ $(SLO)$/os_root.obj \
812
+ $(SLO)$/os_rpath.obj \
813
+ $(SLO)$/os_stack.obj \
814
+ $(SLO)$/os_tmpdir.obj \
817
+.INCLUDE : target.mk
819
--- misc/db-4.7.25.NC/os/os_fsync.c 2008-05-06 05:03:37.000000000 +0200
820
+++ misc/build/db-4.7.25.NC/os/os_fsync.c 2009-07-21 11:42:03.000000000 +0200
822
ret = DB_GLOBAL(j_fsync)(fhp->fd);
824
#if defined(F_FULLFSYNC)
825
+/* When running OOo on MacOS using an NFS mounted disk, fcntl failed with errno
826
+ ENOTTY (25). Since full sync only works on HFS, FAT and UDF (according to the
827
+ man page) and also is more time consuming we just use the fallback.
828
RETRY_CHK((fcntl(fhp->fd, F_FULLFSYNC, 0)), ret);
831
* On OS X, F_FULLSYNC only works on HFS+, so we need to fall
832
* back to regular fsync on other filesystems.
834
- if (ret == ENOTSUP)
835
- RETRY_CHK((fsync(fhp->fd)), ret);
836
+/* if (ret == ENOTSUP)
838
+ RETRY_CHK((fsync(fhp->fd)), ret);
839
#elif defined(HAVE_QNX)
840
ret = __qnx_fsync(fhp);
841
#elif defined(HAVE_FDATASYNC)
842
--- misc/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:42:40.000000000 +0200
843
+++ misc/build/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:39:26.000000000 +0200
846
+PRJ=..$/..$/..$/..$/..
851
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
853
+.INCLUDE : settings.mk
855
+INCPRE+=..$/build_windows ..$/
856
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
859
+ $(SLO)$/os_abs.obj \
860
+ $(SLO)$/os_clock.obj \
861
+ $(SLO)$/os_config.obj \
862
+ $(SLO)$/os_cpu.obj \
863
+ $(SLO)$/os_dir.obj \
864
+ $(SLO)$/os_errno.obj \
865
+ $(SLO)$/os_fid.obj \
866
+ $(SLO)$/os_flock.obj \
867
+ $(SLO)$/os_fsync.obj \
868
+ $(SLO)$/os_getenv.obj \
869
+ $(SLO)$/os_handle.obj \
870
+ $(SLO)$/os_map.obj \
871
+ $(SLO)$/os_mkdir.obj \
872
+ $(SLO)$/os_open.obj \
873
+ $(SLO)$/os_rename.obj \
874
+ $(SLO)$/os_rw.obj \
875
+ $(SLO)$/os_seek.obj \
876
+ $(SLO)$/os_stat.obj \
877
+ $(SLO)$/os_truncate.obj \
878
+ $(SLO)$/os_unlink.obj \
879
+ $(SLO)$/os_yield.obj \
881
+.INCLUDE : target.mk
883
--- misc/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:42:40.000000000 +0200
884
+++ misc/build/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:39:26.000000000 +0200
887
+PRJ=..$/..$/..$/..$/..
892
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
894
+.INCLUDE : settings.mk
896
+INCPRE+=..$/build_windows ..$/
897
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
901
+ $(SLO)$/qam_auto.obj \
902
+ $(SLO)$/qam_conv.obj \
903
+ $(SLO)$/qam_files.obj \
904
+ $(SLO)$/qam_method.obj \
905
+ $(SLO)$/qam_open.obj \
906
+ $(SLO)$/qam_rec.obj \
907
+ $(SLO)$/qam_stat.obj \
908
+ $(SLO)$/qam_upgrade.obj \
909
+ $(SLO)$/qam_verify.obj
911
+.INCLUDE : target.mk
913
--- misc/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:42:40.000000000 +0200
914
+++ misc/build/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:39:26.000000000 +0200
917
+PRJ=..$/..$/..$/..$/..
922
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
924
+.INCLUDE : settings.mk
926
+INCPRE+=..$/build_windows ..$/
927
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
930
+ $(SLO)$/rep_auto.obj \
931
+ $(SLO)$/rep_backup.obj \
932
+ $(SLO)$/rep_elect.obj \
933
+ $(SLO)$/rep_lease.obj \
934
+ $(SLO)$/rep_log.obj \
935
+ $(SLO)$/rep_method.obj \
936
+ $(SLO)$/rep_record.obj \
937
+ $(SLO)$/rep_region.obj \
938
+ $(SLO)$/rep_stat.obj \
939
+ $(SLO)$/rep_util.obj \
940
+ $(SLO)$/rep_verify.obj
942
+.INCLUDE : target.mk
944
--- misc/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:42:40.000000000 +0200
945
+++ misc/build/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:39:26.000000000 +0200
948
+PRJ=..$/..$/..$/..$/..
953
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
955
+.INCLUDE : settings.mk
957
+INCPRE+=..$/build_windows ..$/
958
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
961
+ $(SLO)$/repmgr_auto.obj \
962
+ $(SLO)$/repmgr_elect.obj \
963
+ $(SLO)$/repmgr_method.obj \
964
+ $(SLO)$/repmgr_msg.obj \
965
+ $(SLO)$/repmgr_net.obj \
966
+ $(SLO)$/repmgr_queue.obj \
967
+ $(SLO)$/repmgr_sel.obj \
968
+ $(SLO)$/repmgr_stat.obj \
969
+ $(SLO)$/repmgr_util.obj \
970
+ $(SLO)$/repmgr_windows.obj
972
+.INCLUDE : target.mk
974
--- misc/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:42:40.000000000 +0200
975
+++ misc/build/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:39:26.000000000 +0200
978
+PRJ=..$/..$/..$/..$/..
983
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
985
+.INCLUDE : settings.mk
987
+INCPRE+=..$/build_windows ..$/
988
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
991
+ $(SLO)$/seq_stat.obj \
992
+ $(SLO)$/sequence.obj
994
+.INCLUDE : target.mk
996
--- misc/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:42:40.000000000 +0200
997
+++ misc/build/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:39:26.000000000 +0200
1000
+PRJ=..$/..$/..$/..$/..
1005
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1007
+.INCLUDE : settings.mk
1009
+INCPRE+=..$/build_windows ..$/
1010
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1014
+ $(SLO)$/txn_auto.obj \
1015
+ $(SLO)$/txn_chkpt.obj \
1016
+ $(SLO)$/txn_failchk.obj \
1017
+ $(SLO)$/txn_method.obj \
1018
+ $(SLO)$/txn_rec.obj \
1019
+ $(SLO)$/txn_recover.obj \
1020
+ $(SLO)$/txn_region.obj \
1021
+ $(SLO)$/txn_stat.obj \
1022
+ $(SLO)$/txn_util.obj
1024
+.INCLUDE : target.mk
1026
--- misc/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:42:40.000000000 +0200
1027
+++ misc/build/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:39:26.000000000 +0200
1030
+PRJ=..$/..$/..$/..$/..
1035
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1037
+.INCLUDE : settings.mk
1039
+INCPRE+=..$/build_windows ..$/
1040
+CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1044
+ $(SLO)$/xa_db.obj \
1045
+ $(SLO)$/xa_map.obj
1047
+.INCLUDE : target.mk