Remove unnecessary patch in bdb.mk

[LongShao007]

there is no "__atomic_compare_exchange" function in "src/dbinc/atomic.h".

[daira]

This is confusing because our CI system tests building BDB, which should be deterministic. Can you post your complete build log please?

[daira]

Oh, you mean that particular sed patch is no longer necessary? We'll look into that.

[Eirik0]

Related: 1f623c6

Compare the lines from upstream:

sed -i.old 's/__atomic_compare_exchange/__atomic_compare_exchange_db/' dbinc/atomic.h && \
sed -i.old 's/atomic_init/atomic_init_db/' dbinc/atomic.h mp/mp_region.c mp/mp_mvcc.c mp/mp_fget.c mutex/mut_method.c mutex/mut_tas.c

to those in zcash:

sed -i.old 's/__atomic_compare_exchange\\(/__atomic_compare_exchange_db(/' src/dbinc/atomic.h && \
sed -i.old 's/atomic_init/atomic_init_db/' src/dbinc/atomic.h src/mp/mp_region.c src/mp/mp_mvcc.c src/mp/mp_fget.c src/mutex/mut_method.c src/mutex/mut_tas.c

In zcash the directories start with src/ but in the first line there is also an extra \\( and (. I am wondering if that is the issue.

[mms710]

Blocked pending comment from @Eirik0 on a different approach we could take.

[Eirik0]

@LongShao007 could you try changing the line from

sed -i.old 's/__atomic_compare_exchange\\(/__atomic_compare_exchange_db(/' src/dbinc/atomic.h && \

to

sed -i.old 's/__atomic_compare_exchange/__atomic_compare_exchange_db/' src/dbinc/atomic.h && \

rather than removing it and see if that works?

[daira]

utACK (with @str4d and @therealyingtong ). Eirik's comment was incorrect; there is no remaining instance of __atomic_compare_exchange that needs to be patched. (It was removed between the version of bdb used by Bitcoin Core, and version 6.2.3.)

[daira]

@zkbot r+

[zkbot]

📌 Commit 9c96aff has been approved by daira

[zkbot]

⌛ Testing commit 9c96aff with merge 9487115...

[zkbot]

☀️ Test successful - pr-merge
Approved by: daira
Pushing 9487115 to master...