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_...@o@: $(srcdir)/examples_c/bench_001.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + bench_001: bench_...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) bench_...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + d...@o@: $(srcdir)/test_server/dbs.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs...@o@: $(srcdir)/test_server/dbs_am.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_checkpo...@o@: $(srcdir)/test_server/dbs_checkpoint.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_de...@o@: $(srcdir)/test_server/dbs_debug.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_hand...@o@: $(srcdir)/test_server/dbs_handles.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_...@o@: $(srcdir)/test_server/dbs_log.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_...@o@: $(srcdir)/test_server/dbs_qam.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_sp...@o@: $(srcdir)/test_server/dbs_spawn.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_tric...@o@: $(srcdir)/test_server/dbs_trickle.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_u...@o@: $(srcdir)/test_server/dbs_util.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + dbs_yi...@o@: $(srcdir)/test_server/dbs_yield.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + DBS_OBJS=\ + d...@o@ dbs...@o@ dbs_checkpo...@o@ dbs_de...@o@ dbs_hand...@o@ \ + dbs_...@o@ dbs_...@o@ dbs_sp...@o@ dbs_tric...@o@ dbs_u...@o@ \ +@@ -1212,47 +1212,47 @@ dbs: $(DBS_OBJS) $(DEF_LIB) + $(POSTLINK) $@ + + db_p...@o@: $(srcdir)/test_perf/db_perf.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_checkpo...@o@: $(srcdir)/test_perf/perf_checkpoint.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_con...@o@: $(srcdir)/test_perf/perf_config.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_...@o@: $(srcdir)/test_perf/perf_dbs.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_d...@o@: $(srcdir)/test_perf/perf_dead.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_de...@o@: $(srcdir)/test_perf/perf_debug.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_f...@o@: $(srcdir)/test_perf/perf_file.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_...@o@: $(srcdir)/test_perf/perf_key.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_...@o@: $(srcdir)/test_perf/perf_log.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_m...@o@: $(srcdir)/test_perf/perf_misc.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf...@o@: $(srcdir)/test_perf/perf_op.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_pa...@o@: $(srcdir)/test_perf/perf_parse.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_r...@o@: $(srcdir)/test_perf/perf_rand.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_sp...@o@: $(srcdir)/test_perf/perf_spawn.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_s...@o@: $(srcdir)/test_perf/perf_stat.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_s...@o@: $(srcdir)/test_perf/perf_sync.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_thr...@o@: $(srcdir)/test_perf/perf_thread.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_tric...@o@: $(srcdir)/test_perf/perf_trickle.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_...@o@: $(srcdir)/test_perf/perf_txn.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf_u...@o@: $(srcdir)/test_perf/perf_util.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + perf...@o@: $(srcdir)/test_perf/perf_vx.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + DBPERF_OBJS=\ + db_p...@o@ perf_checkpo...@o@ perf_con...@o@ perf_...@o@ \ + perf_d...@o@ perf_de...@o@ perf_f...@o@ perf_...@o@ perf_...@o@ \ +@@ -1265,7 +1265,7 @@ db_perf: $(DBPERF_OBJS) $(DEF_LIB) + $(POSTLINK) $@ + + db_reps...@o@: $(srcdir)/test_repmgr/db_repsite.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + dbrepsite_objs=db_reps...@o@ + db_repsite: $(DBREPSITE_OBJS) $(DEF_LIB_CXX) + $(CXXLINK) -o $@ \ +@@ -1273,15 +1273,15 @@ db_repsite: $(DBREPSITE_OBJS) $(DEF_LIB_ + $(POSTLINK) $@ + + db_rept...@o@: $(srcdir)/test_repmgr/db_reptest.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + reptest...@o@: $(srcdir)/test_repmgr/reptest_am.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + reptest_hand...@o@: $(srcdir)/test_repmgr/reptest_handles.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + reptest_sp...@o@: $(srcdir)/test_repmgr/reptest_spawn.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + reptest_u...@o@: $(srcdir)/test_repmgr/reptest_util.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + DBREPTEST_OBJS=\ + db_rept...@o@ reptest...@o@ reptest_hand...@o@ \ + reptest_sp...@o@ reptest_u...@o@ +@@ -1292,23 +1292,23 @@ db_reptest: $(DBREPTEST_OBJS) $(DEF_LIB) + $(POSTLINK) $@ + + test_db...@o@: $(srcdir)/test_stl/base/test_dbstl.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + test_u...@o@: $(srcdir)/test_stl/base/test_util.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + + stl_t...@o@: $(srcdir)/test_stl/stlport/stl_test.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + util...@o@: $(srcdir)/test_stl/stlport/utility.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + stlport_test_buil...@o@: $(srcdir)/test_stl/stlport/stlport_test_builder.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + + ms_stl_m...@o@: $(srcdir)/test_stl/ms_examples/ms_stl_main.cpp +- $(CXX) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION $? ++ $(CXXCOMPILE) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION $? + ms_stl_com...@o@: $(srcdir)/test_stl/ms_examples/ms_stl_common.cpp +- $(CXX) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION $? ++ $(CXXCOMPILE) $(STLFLAGS) -DGCC_BAD_AUTO_CONVERSION $? + test_buil...@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_db...@o@ test_u...@o@ + db_stl_stlport_test_objs=stl_t...@o@ stlport_test_buil...@o@ util...@o@ +@@ -1330,44 +1330,44 @@ test_dbstl_stlport: $(DB_STL_STLPORT_TES + $(POSTLINK) $@ + + b_cural...@o@: $(srcdir)/test_micro/source/b_curalloc.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_curw...@o@: $(srcdir)/test_micro/source/b_curwalk.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_...@o@: $(srcdir)/test_micro/source/b_del.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_...@o@: $(srcdir)/test_micro/source/b_get.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_in...@o@: $(srcdir)/test_micro/source/b_inmem.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_la...@o@: $(srcdir)/test_micro/source/b_latch.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_l...@o@: $(srcdir)/test_micro/source/b_load.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_o...@o@: $(srcdir)/test_micro/source/b_open.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_...@o@: $(srcdir)/test_micro/source/b_put.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_reco...@o@: $(srcdir)/test_micro/source/b_recover.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_...@o@: $(srcdir)/test_micro/source/b_txn.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_txn_wr...@o@: $(srcdir)/test_micro/source/b_txn_write.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_un...@o@: $(srcdir)/test_micro/source/b_uname.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_u...@o@: $(srcdir)/test_micro/source/b_util.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + b_workl...@o@: $(srcdir)/test_micro/source/b_workload.c +- $(CC) $(CFLAGS) -I$(srcdir)/test_micro/source $? ++ $(CCCOMPILE) $(CFLAGS) -I$(srcdir)/test_micro/source $? + test_mi...@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_mu...@o@: $(srcdir)/mutex/test_mutex.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + test_mutex: test_mu...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) test_mu...@o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ +@@ -1376,19 +1376,19 @@ test_mutex: test_mu...@o@ $(DEF_LIB) + # Example programs for C. + ################################################## + ex_acc...@o@: $(srcdir)/examples_c/ex_access.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_access: ex_acc...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_acc...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_app...@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_apprec_a...@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_auto.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_apprec_au...@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_autop.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_apprec_...@o@: $(srcdir)/examples_c/ex_apprec/ex_apprec_rec.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + EX_APPREC_OBJS=\ + ex_app...@o@ ex_apprec_a...@o@ ex_apprec_au...@o@ ex_apprec_...@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_bt...@o@: $(srcdir)/examples_c/ex_btrec.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_btrec: ex_bt...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_bt...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_dbcli...@o@: $(srcdir)/examples_c/ex_dbclient.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_dbclient: ex_dbcli...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_dbcli...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_...@o@: $(srcdir)/examples_c/ex_env.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_env: ex_...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_l...@o@: $(srcdir)/examples_c/ex_lock.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_lock: ex_l...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_l...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_mp...@o@: $(srcdir)/examples_c/ex_mpool.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_mpool: ex_mp...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_mp...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + rep_b...@o@: $(srcdir)/examples_c/ex_rep/base/rep_base.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + rep_com...@o@: $(srcdir)/examples_c/ex_rep/common/rep_common.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + rep_...@o@: $(srcdir)/examples_c/ex_rep/base/rep_msg.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + rep_...@o@: $(srcdir)/examples_c/ex_rep/base/rep_net.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + EX_REP_BASE_OBJS=\ + rep_b...@o@ rep_com...@o@ rep_...@o@ rep_...@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_...@o@: $(srcdir)/examples_c/ex_rep_gsg/simple_txn.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_rep_gsg_simple: simple_...@o@ $(DEF_LIB) + $(CCLINK) -o $@ \ + $(LDFLAGS) simple_...@o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ + + rep_mgr_...@o@: $(srcdir)/examples_c/ex_rep_gsg/rep_mgr_gsg.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_rep_gsg_repmgr: rep_mgr_...@o@ $(DEF_LIB) + $(CCLINK) -o $@ \ + $(LDFLAGS) rep_mgr_...@o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ + + rep_...@o@: $(srcdir)/examples_c/ex_rep/mgr/rep_mgr.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + EX_REP_MGR_OBJS=\ + rep_com...@o@ rep_...@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_seque...@o@: $(srcdir)/examples_c/ex_sequence.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_sequence: ex_seque...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_seque...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_str...@o@: $(srcdir)/examples_c/ex_stream.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_stream: ex_str...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_str...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + ex_thr...@o@: $(srcdir)/examples_c/ex_thread.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_thread: ex_thr...@o@ $(DEF_LIB) + $(CCLINK) -o $@ \ + $(LDFLAGS) ex_thr...@o@ $(DEF_LIB) $(TEST_LIBS) $(LIBS) + $(POSTLINK) $@ + + ex_t...@o@: $(srcdir)/examples_c/ex_tpcb.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + ex_tpcb: ex_t...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) ex_t...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + gettingstarted_com...@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_l...@o@: \ + $(srcdir)/examples_c/getting_started/example_database_load.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + example_database_r...@o@: \ + $(srcdir)/examples_c/getting_started/example_database_read.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + example_database_load: example_database_l...@o@ gettingstarted_com...@o@ \ + $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) \ +@@ -1509,13 +1509,13 @@ example_database_read: example_database_ + $(POSTLINK) $@ + + txn_guide_inmem...@o@: $(srcdir)/examples_c/txn_guide/txn_guide_inmemory.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + txn_guide_inmemory: txn_guide_inmem...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) txn_guide_inmem...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ + + txn_gu...@o@: $(srcdir)/examples_c/txn_guide/txn_guide.c +- $(CC) $(CFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $? + txn_guide: txn_gu...@o@ $(DEF_LIB) + $(CCLINK) -o $@ $(LDFLAGS) txn_gu...@o@ $(DEF_LIB) $(LIBS) + $(POSTLINK) $@ +@@ -1524,76 +1524,76 @@ txn_guide: txn_gu...@o@ $(DEF_LIB) + # Example programs for C++. + ################################################## + accessexam...@o@: $(srcdir)/examples_cxx/AccessExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_access: accessexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) accessexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + btrecexam...@o@: $(srcdir)/examples_cxx/BtRecExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_btrec: btrecexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) btrecexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + envexam...@o@: $(srcdir)/examples_cxx/EnvExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_env: envexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) envexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + lockexam...@o@: $(srcdir)/examples_cxx/LockExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_lock: lockexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) lockexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + mpoolexam...@o@: $(srcdir)/examples_cxx/MpoolExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_mpool: mpoolexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) mpoolexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + repquoteexam...@o@: $(srcdir)/examples_cxx/excxx_repquote/RepQuoteExample.cpp +- $(CXX) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $? ++ $(CXXCOMPILE) -I$(srcdir)/examples_cxx/excxx_repquote $(CXXFLAGS) $? + repconfigi...@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: repquoteexam...@o@ repconfigi...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) \ + repquoteexam...@o@ repconfigi...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + repmgr...@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: repmgr...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) repmgr...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + simple...@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: simple...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) simple...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + sequenceexam...@o@: $(srcdir)/examples_cxx/SequenceExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_sequence: sequenceexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) sequenceexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + tpcbexam...@o@: $(srcdir)/examples_cxx/TpcbExample.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + excxx_tpcb: tpcbexam...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) tpcbexam...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + excxx_example_database_l...@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_r...@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) $? + m...@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_l...@o@ m...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) \ +@@ -1606,13 +1606,13 @@ excxx_example_database_read: \ + $(POSTLINK) $@ + + txnguideinmem...@o@: $(srcdir)/examples_cxx/txn_guide/TxnGuideInMemory.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + TxnGuideInMemory: txnguideinmem...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) txnguideinmem...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ + + txngu...@o@: $(srcdir)/examples_cxx/txn_guide/TxnGuide.cpp +- $(CXX) $(CXXFLAGS) $? ++ $(CXXCOMPILE) $(CXXFLAGS) $? + TxnGuide: txngu...@o@ $(DEF_LIB_CXX) + $(CXXLINK) -o $@ $(LDFLAGS) txngu...@o@ $(DEF_LIB_CXX) $(LIBS) + $(POSTLINK) $@ +@@ -1621,34 +1621,34 @@ TxnGuide: txngu...@o@ $(DEF_LIB_CXX) + # Example programs for STL. + ################################################## + stlaccessexam...@o@: $(srcdir)/examples_stl/StlAccessExample.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + exstl_access: stlaccessexam...@o@ $(DEF_LIB_STL) + $(CXXLINK) -o $@ $(LDFLAGS) stlaccessexam...@o@ $(DEF_LIB_STL) $(LIBS) + $(POSTLINK) $@ + + stladvancedfeatu...@o@: $(srcdir)/examples_stl/StlAdvancedFeatures.cpp +- $(CXX) -I$(srcdir)/examples_stl $(STLFLAGS) $? ++ $(CXXCOMPILE) -I$(srcdir)/examples_stl $(STLFLAGS) $? + exstl_advancedfeatures: stladvancedfeatu...@o@ $(DEF_LIB_STL) + $(CXXLINK) -o $@ $(LDFLAGS) stladvancedfeatu...@o@ $(DEF_LIB_STL) $(LIBS) + $(POSTLINK) $@ + + stlrepquoteexam...@o@: $(srcdir)/examples_stl/repquote/StlRepQuoteExample.cpp +- $(CXX) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $? ++ $(CXXCOMPILE) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $? + stlrepconfigi...@o@: $(srcdir)/examples_stl/repquote/StlRepConfigInfo.cpp +- $(CXX) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $? ++ $(CXXCOMPILE) -I$(srcdir)/examples_stl/repquote $(STLFLAGS) $? + exstl_repquote: stlrepquoteexam...@o@ stlrepconfigi...@o@ $(DEF_LIB_STL) + $(CXXLINK) -o $@ $(LDFLAGS) \ + stlrepquoteexam...@o@ stlrepconfigi...@o@ $(DEF_LIB_STL) $(LIBS) + $(POSTLINK) $@ + + stltpcbexam...@o@: $(srcdir)/examples_stl/StlTpcbExample.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + exstl_tpcb: stltpcbexam...@o@ $(DEF_LIB_STL) + $(CXXLINK) -o $@ $(LDFLAGS) stltpcbexam...@o@ $(DEF_LIB_STL) $(LIBS) + $(POSTLINK) $@ + + stltransactionguideexam...@o@: $(srcdir)/examples_stl/StlTransactionGuideExample.cpp +- $(CXX) $(STLFLAGS) $? ++ $(CXXCOMPILE) $(STLFLAGS) $? + StlTxnGuide: stltransactionguideexam...@o@ $(DEF_LIB_STL) + $(CXXLINK) -o $@ $(LDFLAGS) stltransactionguideexam...@o@ $(DEF_LIB_STL) $(LIBS) + $(POSTLINK) $@ +@@ -1697,779 +1697,779 @@ ex_sql_transaction: ex_sql_transact...@o + $(POSTLINK) $@ + + ex_sql_bind...@o@: $(srcdir)/sql/examples/c/ex_sql_binding.c +- $(CC) $(CFLAGS) $(SQLFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $? + ex_sql_f...@o@: $(srcdir)/sql/examples/c/ex_sql_fts3.c +- $(CC) $(CFLAGS) $(SQLFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $? + ex_sql_in...@o@: $(srcdir)/sql/examples/c/ex_sql_index.c +- $(CC) $(CFLAGS) $(SQLFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $? + ex_sql_l...@o@: $(srcdir)/sql/examples/c/ex_sql_load.c +- $(CC) $(CFLAGS) $(SQLFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $? + ex_sql_multi_thr...@o@: $(srcdir)/sql/examples/c/ex_sql_multi_thread.c +- $(CC) $(CFLAGS) $(SQLFLAGS) $? ++ $(CCCOMPILE) $(CFLAGS) $(SQLFLAGS) $? <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
