packages: rpm/db.patch (NEW) Fix building internal BDB

wiget wiget at pld-linux.org
Tue Jun 1 22:30:52 CEST 2010


Author: wiget                        Date: Tue Jun  1 20:30:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
Fix building internal BDB

---- Files affected:
packages/rpm:
   db.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rpm/db.patch
diff -u /dev/null packages/rpm/db.patch:1.1
--- /dev/null	Tue Jun  1 22:30:52 2010
+++ packages/rpm/db.patch	Tue Jun  1 22:30:47 2010
@@ -0,0 +1,1728 @@
+--- rpm-5.3.1/db/dist/Makefile.in.wiget	2010-04-01 17:24:52.000000000 +0200
++++ rpm-5.3.1/db/dist/Makefile.in	2010-06-01 21:01:42.771397807 +0200
+@@ -59,7 +59,7 @@ CPPFLAGS=	-I$(builddir) -I$(srcdir) @CPP
+ # C API.
+ ##################################################
+ CFLAGS=		-c $(CPPFLAGS) @CFLAGS@
+-CC=		@MAKEFILE_CC@
++CCCOMPILE=	@MAKEFILE_CC@
+ CCLINK=		@MAKEFILE_CCLINK@ @CFLAGS@
+ 
+ LDFLAGS=	@LDFLAGS@
+@@ -81,7 +81,7 @@ libso_major=	$(libdb_base)-$(LIBMAJOR)@S
+ # C++ support is optional, and can be built with static or shared libraries.
+ ##################################################
+ CXXFLAGS=	-c $(CPPFLAGS) @CXXFLAGS@
+-CXX=		@MAKEFILE_CXX@
++CXXCOMPILE=	@MAKEFILE_CXX@
+ CXXLINK=	@MAKEFILE_CXXLINK@ @CXXFLAGS@
+ XSOLINK=	@MAKEFILE_XSOLINK@ @CXXFLAGS@
+ LIBXSO_LIBS=	@LIBXSO_LIBS@ @LIBSO_LIBS@
+@@ -1175,33 +1175,33 @@ dist rpm rpmbuild:
+ # Testers, benchmarks.
+ ##################################################
+ bench_001 at o@: $(srcdir)/examples_c/bench_001.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ bench_001: bench_001 at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) bench_001 at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ dbs at o@: $(srcdir)/test_server/dbs.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_am at o@: $(srcdir)/test_server/dbs_am.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_checkpoint at o@: $(srcdir)/test_server/dbs_checkpoint.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_debug at o@: $(srcdir)/test_server/dbs_debug.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_handles at o@: $(srcdir)/test_server/dbs_handles.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_log at o@: $(srcdir)/test_server/dbs_log.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_qam at o@: $(srcdir)/test_server/dbs_qam.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_spawn at o@: $(srcdir)/test_server/dbs_spawn.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_trickle at o@: $(srcdir)/test_server/dbs_trickle.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_util at o@: $(srcdir)/test_server/dbs_util.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ dbs_yield at o@: $(srcdir)/test_server/dbs_yield.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ DBS_OBJS=\
+ 	dbs at o@ dbs_am at o@ dbs_checkpoint at o@ dbs_debug at o@ dbs_handles at o@ \
+ 	dbs_log at o@ dbs_qam at o@ dbs_spawn at o@ dbs_trickle at o@ dbs_util at o@ \
+@@ -1212,47 +1212,47 @@ dbs: $(DBS_OBJS) $(DEF_LIB)
+ 	$(POSTLINK) $@
+ 
+ db_perf at o@: $(srcdir)/test_perf/db_perf.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_checkpoint at o@: $(srcdir)/test_perf/perf_checkpoint.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_config at o@: $(srcdir)/test_perf/perf_config.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_dbs at o@: $(srcdir)/test_perf/perf_dbs.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_dead at o@: $(srcdir)/test_perf/perf_dead.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_debug at o@: $(srcdir)/test_perf/perf_debug.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_file at o@: $(srcdir)/test_perf/perf_file.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_key at o@: $(srcdir)/test_perf/perf_key.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_log at o@: $(srcdir)/test_perf/perf_log.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_misc at o@: $(srcdir)/test_perf/perf_misc.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_op at o@: $(srcdir)/test_perf/perf_op.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_parse at o@: $(srcdir)/test_perf/perf_parse.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_rand at o@: $(srcdir)/test_perf/perf_rand.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_spawn at o@: $(srcdir)/test_perf/perf_spawn.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_stat at o@: $(srcdir)/test_perf/perf_stat.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_sync at o@: $(srcdir)/test_perf/perf_sync.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_thread at o@: $(srcdir)/test_perf/perf_thread.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_trickle at o@: $(srcdir)/test_perf/perf_trickle.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_txn at o@: $(srcdir)/test_perf/perf_txn.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_util at o@: $(srcdir)/test_perf/perf_util.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ perf_vx at o@: $(srcdir)/test_perf/perf_vx.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ DBPERF_OBJS=\
+ 	db_perf at o@ perf_checkpoint at o@ perf_config at o@ perf_dbs at o@ \
+ 	perf_dead at o@ perf_debug at o@ perf_file at o@ perf_key at o@ perf_log at o@ \
+@@ -1265,7 +1265,7 @@ db_perf: $(DBPERF_OBJS) $(DEF_LIB)
+ 	$(POSTLINK) $@
+ 
+ db_repsite at o@: $(srcdir)/test_repmgr/db_repsite.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ DBREPSITE_OBJS=db_repsite at o@
+ db_repsite: $(DBREPSITE_OBJS) $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ \
+@@ -1273,15 +1273,15 @@ db_repsite: $(DBREPSITE_OBJS) $(DEF_LIB_
+ 	$(POSTLINK) $@ 
+ 
+ db_reptest at o@: $(srcdir)/test_repmgr/db_reptest.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ reptest_am at o@: $(srcdir)/test_repmgr/reptest_am.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ reptest_handles at o@: $(srcdir)/test_repmgr/reptest_handles.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ reptest_spawn at o@: $(srcdir)/test_repmgr/reptest_spawn.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ reptest_util at o@: $(srcdir)/test_repmgr/reptest_util.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ DBREPTEST_OBJS=\
+ 	db_reptest at o@ reptest_am at o@ reptest_handles at o@ \
+ 	reptest_spawn at o@ reptest_util at o@ 
+@@ -1292,23 +1292,23 @@ db_reptest: $(DBREPTEST_OBJS) $(DEF_LIB)
+ 	$(POSTLINK) $@
+ 
+ test_dbstl at o@: $(srcdir)/test_stl/base/test_dbstl.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ test_util at o@: $(srcdir)/test_stl/base/test_util.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ 
+ stl_test at o@: $(srcdir)/test_stl/stlport/stl_test.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ utility at o@: $(srcdir)/test_stl/stlport/utility.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ stlport_test_builder at o@: $(srcdir)/test_stl/stlport/stlport_test_builder.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ 
+ ms_stl_main at o@: $(srcdir)/test_stl/ms_examples/ms_stl_main.cpp
+-	$(CXX) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION  $?
++	$(CXXCOMPILE) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION  $?
+ ms_stl_common at o@: $(srcdir)/test_stl/ms_examples/ms_stl_common.cpp
+-	$(CXX) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION  $?
++	$(CXXCOMPILE) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION  $?
+ test_builder at o@: $(srcdir)/test_stl/ms_examples/test_builder.cpp
+-	$(CXX) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION  $?
++	$(CXXCOMPILE) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION  $?
+ 
+ DB_STL_TEST_OBJS=test_dbstl at o@ test_util at o@
+ DB_STL_STLPORT_TEST_OBJS=stl_test at o@ stlport_test_builder at o@ utility at o@
+@@ -1330,44 +1330,44 @@ test_dbstl_stlport: $(DB_STL_STLPORT_TES
+ 	$(POSTLINK) $@
+ 
+ b_curalloc at o@: $(srcdir)/test_micro/source/b_curalloc.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_curwalk at o@: $(srcdir)/test_micro/source/b_curwalk.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_del at o@: $(srcdir)/test_micro/source/b_del.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_get at o@: $(srcdir)/test_micro/source/b_get.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_inmem at o@: $(srcdir)/test_micro/source/b_inmem.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_latch at o@: $(srcdir)/test_micro/source/b_latch.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_load at o@: $(srcdir)/test_micro/source/b_load.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_open at o@: $(srcdir)/test_micro/source/b_open.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_put at o@: $(srcdir)/test_micro/source/b_put.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_recover at o@: $(srcdir)/test_micro/source/b_recover.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_txn at o@: $(srcdir)/test_micro/source/b_txn.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_txn_write at o@: $(srcdir)/test_micro/source/b_txn_write.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_uname at o@: $(srcdir)/test_micro/source/b_uname.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_util at o@: $(srcdir)/test_micro/source/b_util.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ b_workload at o@: $(srcdir)/test_micro/source/b_workload.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ test_micro at o@: $(srcdir)/test_micro/source/test_micro.c
+-	$(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $?
++	$(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $?
+ test_micro: $(TEST_MICRO_OBJS) $(DEF_LIB)
+ 	$(CCLINK) -o $@ \
+ 	    $(LDFLAGS) $(TEST_MICRO_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ test_mutex at o@: $(srcdir)/mutex/test_mutex.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ test_mutex: test_mutex at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) test_mutex at o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS)
+ 	$(POSTLINK) $@
+@@ -1376,19 +1376,19 @@ test_mutex: test_mutex at o@ $(DEF_LIB)
+ # Example programs for C.
+ ##################################################
+ ex_access at o@: $(srcdir)/examples_c/ex_access.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_access: ex_access at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_access at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_apprec at o@: $(srcdir)/examples_c/ex_apprec/ex_apprec.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_apprec_auto at o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_auto.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_apprec_autop at o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_autop.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_apprec_rec at o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_rec.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ EX_APPREC_OBJS=\
+ 	ex_apprec at o@ ex_apprec_auto at o@ ex_apprec_autop at o@ ex_apprec_rec at o@
+ ex_apprec: $(EX_APPREC_OBJS) $(DEF_LIB)
+@@ -1396,43 +1396,43 @@ ex_apprec: $(EX_APPREC_OBJS) $(DEF_LIB)
+ 	    $(LDFLAGS) $(EX_APPREC_OBJS) $(DEF_LIB) $(TEST_LIBS) $(LIBS)
+ 
+ ex_btrec at o@: $(srcdir)/examples_c/ex_btrec.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_btrec: ex_btrec at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_btrec at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_dbclient at o@: $(srcdir)/examples_c/ex_dbclient.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_dbclient: ex_dbclient at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_dbclient at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_env at o@: $(srcdir)/examples_c/ex_env.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_env: ex_env at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_env at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_lock at o@: $(srcdir)/examples_c/ex_lock.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_lock: ex_lock at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_lock at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_mpool at o@: $(srcdir)/examples_c/ex_mpool.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_mpool: ex_mpool at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_mpool at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ rep_base at o@: $(srcdir)/examples_c/ex_rep/base/rep_base.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ rep_common at o@: $(srcdir)/examples_c/ex_rep/common/rep_common.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ rep_msg at o@: $(srcdir)/examples_c/ex_rep/base/rep_msg.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ rep_net at o@: $(srcdir)/examples_c/ex_rep/base/rep_net.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ EX_REP_BASE_OBJS=\
+ 	rep_base at o@ rep_common at o@ rep_msg at o@ rep_net at o@
+ ex_rep_base: $(EX_REP_BASE_OBJS) $(DEF_LIB)
+@@ -1441,21 +1441,21 @@ ex_rep_base: $(EX_REP_BASE_OBJS) $(DEF_L
+ 	$(POSTLINK) $@
+ 
+ simple_txn at o@: $(srcdir)/examples_c/ex_rep_gsg/simple_txn.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_rep_gsg_simple: simple_txn at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ \
+ 	    $(LDFLAGS) simple_txn at o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ rep_mgr_gsg at o@: $(srcdir)/examples_c/ex_rep_gsg/rep_mgr_gsg.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_rep_gsg_repmgr: rep_mgr_gsg at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ \
+ 	    $(LDFLAGS) rep_mgr_gsg at o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ rep_mgr at o@: $(srcdir)/examples_c/ex_rep/mgr/rep_mgr.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ EX_REP_MGR_OBJS=\
+ 	rep_common at o@ rep_mgr at o@
+ ex_rep_mgr: $(EX_REP_MGR_OBJS) $(DEF_LIB)
+@@ -1464,39 +1464,39 @@ ex_rep_mgr: $(EX_REP_MGR_OBJS) $(DEF_LIB
+ 	$(POSTLINK) $@
+ 
+ ex_sequence at o@: $(srcdir)/examples_c/ex_sequence.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_sequence: ex_sequence at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_sequence at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_stream at o@: $(srcdir)/examples_c/ex_stream.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_stream: ex_stream at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_stream at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_thread at o@: $(srcdir)/examples_c/ex_thread.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_thread: ex_thread at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ \
+ 	    $(LDFLAGS) ex_thread at o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ ex_tpcb at o@: $(srcdir)/examples_c/ex_tpcb.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ ex_tpcb: ex_tpcb at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) ex_tpcb at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ gettingstarted_common at o@: \
+     $(srcdir)/examples_c/getting_started/gettingstarted_common.c
+-	$(CC) -I$(srcdir)/examples_c/getting_started $(CFLAGS) $?
++	$(CCCOMPILE) -I$(srcdir)/examples_c/getting_started $(CFLAGS) $?
+ example_database_load at o@: \
+     $(srcdir)/examples_c/getting_started/example_database_load.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ example_database_read at o@: \
+     $(srcdir)/examples_c/getting_started/example_database_read.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ example_database_load: example_database_load at o@ gettingstarted_common at o@ \
+     $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) \
+@@ -1509,13 +1509,13 @@ example_database_read: example_database_
+ 	$(POSTLINK) $@
+ 
+ txn_guide_inmemory at o@: $(srcdir)/examples_c/txn_guide/txn_guide_inmemory.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ txn_guide_inmemory: txn_guide_inmemory at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) txn_guide_inmemory at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ txn_guide at o@: $(srcdir)/examples_c/txn_guide/txn_guide.c
+-	$(CC) $(CFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $?
+ txn_guide: txn_guide at o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) txn_guide at o@ $(DEF_LIB) $(LIBS)
+ 	$(POSTLINK) $@
+@@ -1524,76 +1524,76 @@ txn_guide: txn_guide at o@ $(DEF_LIB)
+ # Example programs for C++.
+ ##################################################
+ AccessExample at o@: $(srcdir)/examples_cxx/AccessExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_access: AccessExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) AccessExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ BtRecExample at o@: $(srcdir)/examples_cxx/BtRecExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_btrec: BtRecExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) BtRecExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ EnvExample at o@: $(srcdir)/examples_cxx/EnvExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_env: EnvExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) EnvExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ LockExample at o@: $(srcdir)/examples_cxx/LockExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_lock: LockExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) LockExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ MpoolExample at o@: $(srcdir)/examples_cxx/MpoolExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_mpool: MpoolExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) MpoolExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ RepQuoteExample at o@: $(srcdir)/examples_cxx/excxx_repquote/RepQuoteExample.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $?
+ RepConfigInfo at o@: $(srcdir)/examples_cxx/excxx_repquote/RepConfigInfo.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $?
+ excxx_repquote: RepQuoteExample at o@ RepConfigInfo at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) \
+ 	    RepQuoteExample at o@ RepConfigInfo at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ RepMgrGSG at o@: $(srcdir)/examples_cxx/excxx_repquote_gsg/RepMgrGSG.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/excxx_repquote_gsg $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/excxx_repquote_gsg $(CXXFLAGS) $?
+ excxx_repquote_gsg_repmgr: RepMgrGSG at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) RepMgrGSG at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ SimpleTxn at o@: $(srcdir)/examples_cxx/excxx_repquote_gsg/SimpleTxn.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/excxx_repquote_gsg $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/excxx_repquote_gsg $(CXXFLAGS) $?
+ excxx_repquote_gsg_simple: SimpleTxn at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) SimpleTxn at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ SequenceExample at o@: $(srcdir)/examples_cxx/SequenceExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_sequence: SequenceExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) SequenceExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ TpcbExample at o@: $(srcdir)/examples_cxx/TpcbExample.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ excxx_tpcb: TpcbExample at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) TpcbExample at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ excxx_example_database_load at o@: \
+     $(srcdir)/examples_cxx/getting_started/excxx_example_database_load.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $?
+ excxx_example_database_read at o@: \
+     $(srcdir)/examples_cxx/getting_started/excxx_example_database_read.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $?
+ MyDb at o@: $(srcdir)/examples_cxx/getting_started/MyDb.cpp
+-	$(CXX) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_cxx/getting_started $(CXXFLAGS) $?
+ excxx_example_database_load: \
+     excxx_example_database_load at o@ MyDb at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) \
+@@ -1606,13 +1606,13 @@ excxx_example_database_read: \
+ 	$(POSTLINK) $@
+ 
+ TxnGuideInMemory at o@: $(srcdir)/examples_cxx/txn_guide/TxnGuideInMemory.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ TxnGuideInMemory: TxnGuideInMemory at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) TxnGuideInMemory at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ TxnGuide at o@: $(srcdir)/examples_cxx/txn_guide/TxnGuide.cpp
+-	$(CXX) $(CXXFLAGS) $?
++	$(CXXCOMPILE) $(CXXFLAGS) $?
+ TxnGuide: TxnGuide at o@ $(DEF_LIB_CXX)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) TxnGuide at o@ $(DEF_LIB_CXX) $(LIBS)
+ 	$(POSTLINK) $@
+@@ -1621,34 +1621,34 @@ TxnGuide: TxnGuide at o@ $(DEF_LIB_CXX)
+ # Example programs for STL.
+ ##################################################
+ StlAccessExample at o@: $(srcdir)/examples_stl/StlAccessExample.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ exstl_access: StlAccessExample at o@ $(DEF_LIB_STL)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) StlAccessExample at o@ $(DEF_LIB_STL) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ StlAdvancedFeatures at o@: $(srcdir)/examples_stl/StlAdvancedFeatures.cpp
+-	$(CXX) -I$(srcdir)/examples_stl $(STLFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_stl $(STLFLAGS) $?
+ exstl_advancedfeatures: StlAdvancedFeatures at o@ $(DEF_LIB_STL)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) StlAdvancedFeatures at o@ $(DEF_LIB_STL) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ StlRepQuoteExample at o@: $(srcdir)/examples_stl/repquote/StlRepQuoteExample.cpp
+-	$(CXX) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $?
+ StlRepConfigInfo at o@: $(srcdir)/examples_stl/repquote/StlRepConfigInfo.cpp
+-	$(CXX) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $?
++	$(CXXCOMPILE) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $?
+ exstl_repquote: StlRepQuoteExample at o@ StlRepConfigInfo at o@ $(DEF_LIB_STL)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) \
+ 	    StlRepQuoteExample at o@ StlRepConfigInfo at o@ $(DEF_LIB_STL) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ StlTpcbExample at o@: $(srcdir)/examples_stl/StlTpcbExample.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ exstl_tpcb: StlTpcbExample at o@ $(DEF_LIB_STL)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) StlTpcbExample at o@ $(DEF_LIB_STL) $(LIBS)
+ 	$(POSTLINK) $@
+ 
+ StlTransactionGuideExample at o@: $(srcdir)/examples_stl/StlTransactionGuideExample.cpp
+-	$(CXX) $(STLFLAGS) $?
++	$(CXXCOMPILE) $(STLFLAGS) $?
+ StlTxnGuide: StlTransactionGuideExample at o@ $(DEF_LIB_STL)
+ 	$(CXXLINK) -o $@ $(LDFLAGS) StlTransactionGuideExample at o@ $(DEF_LIB_STL) $(LIBS)
+ 	$(POSTLINK) $@
+@@ -1697,779 +1697,779 @@ ex_sql_transaction: ex_sql_transaction at o
+ 	$(POSTLINK) $@
+ 
+ ex_sql_binding at o@: $(srcdir)/sql/examples/c/ex_sql_binding.c
+-	$(CC) $(CFLAGS) $(SQLFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $?
+ ex_sql_fts3 at o@: $(srcdir)/sql/examples/c/ex_sql_fts3.c
+-	$(CC) $(CFLAGS) $(SQLFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $?
+ ex_sql_index at o@: $(srcdir)/sql/examples/c/ex_sql_index.c
+-	$(CC) $(CFLAGS) $(SQLFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $?
+ ex_sql_load at o@: $(srcdir)/sql/examples/c/ex_sql_load.c
+-	$(CC) $(CFLAGS) $(SQLFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $?
+ ex_sql_multi_thread at o@: $(srcdir)/sql/examples/c/ex_sql_multi_thread.c
+-	$(CC) $(CFLAGS) $(SQLFLAGS) $?
++	$(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $?
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list