1525219 - Apply http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;h=0a954f1a67410dceb0fafe202bd6c2f2f409cb4a to in-tree lmdb

Status: RESOLVED FIXED

(Toolkit :: General, defect, P3)

Description

[Mike Hommey [:glandium]]

See bug 1512541 comment 15

Comment 1

[Mike Hommey [:glandium]]

Myk, would you mind taking this?

Comment 2

[Myk Melez [:myk] [@mykmelez]]

(In reply to Mike Hommey [:glandium] from comment #1)

Myk, would you mind taking this?

Yep, I've cherry-picked it to this branch in mozilla/lmdb/:

https://github.com/mozilla/lmdb/tree/mdb.RE/0.9.21-moz

And I've created this branch in mozilla/lmdb-rs that uses that branch of mozilla/lmdb:

https://github.com/mozilla/lmdb-rs/tree/lmdb-sys-0.8.0-android-fix

I've also updated the patch in bug 1490496 to use that branch as its source for the lmdb-sys crate:

https://phabricator.services.mozilla.com/D6328#change-rFeP59HZ8M0a

That should resolve the Android build issue for that patch. But it's just a temporary workaround. In the long term, we should update the version of rkv (and thus LMDB) that is vendored into the tree, which is now several versions newer than the one in that patch. I filed bug 1525392 to do that.

Comment 3

[Sam Foster [:sfoster] (he/him)]

Giving this a priority to get it out of the triage list - please change as necessary.

Comment 4

[Myk Melez [:myk] [@mykmelez]]

Attachment: use version of lmdb-sys with fix for Android build issue

The fix for build bug 1512541 causes an Android build issue. The issue has been fixed upstream in LMDB's development branch, but the fix hasn't made it to LMDB's release branch. So I backported it to a branch in the mozilla/lmdb-rs repo, and this change switches to that branch to fix the Android build issue.

Comment 5

[Myk Melez [:myk] [@mykmelez]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=3615dff0783c49bb783ec573ef795961dfa11d6d

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/cc0ffcd544f0
use version of lmdb-sys with fix for Android build issue r=glandium,froydnj

Comment 7

[Raul Gurzau (:RaulG)]

https://hg.mozilla.org/mozilla-central/rev/cc0ffcd544f0