Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rocksdb: use native rocksdb makefile (and our autotools) #6290

Merged
merged 6 commits into from Oct 18, 2015

Conversation

Projects
None yet
2 participants
@liewegas
Copy link
Member

liewegas commented Oct 16, 2015

This was a huge PITA, but it builds now on my fc22 box. This is improtant
because we need to be able to track rocksdb upstream with minimal friction.

I didn't touch cmake here, but rocks isn't being built at all there anyway.

@liewegas liewegas force-pushed the wip-rocksdb branch from 4c11e10 to 388250a Oct 16, 2015

@liewegas

This comment has been minimized.

Copy link
Member Author

liewegas commented Oct 16, 2015

@dachary i suspect a dirty build tree? this change requires make distclean

@ghost

This comment has been minimized.

Copy link

ghost commented Oct 16, 2015

@liewegas a git clean -fqdx is done prior to building. It looks like it must have a double f in this situation. I made the change, could you please amend and repush ?

@ghost

This comment has been minimized.

Copy link

ghost commented Oct 16, 2015

@liewegas the problem was something else: the bot uses autogen.sh from master which no longer works everywhere with this patch. I changed it to use the autogen.sh from the pull request instead. The reason for this trick was because it is the only script that runs with network access. Could you re-push please ?

@liewegas liewegas force-pushed the wip-rocksdb branch 2 times, most recently from 7f33bb4 to 0d26c18 Oct 16, 2015

@liewegas liewegas force-pushed the wip-rocksdb branch 2 times, most recently from f153b1c to ca62469 Oct 17, 2015

liewegas added some commits Oct 15, 2015

Makefile: make libosd.a static (not .la)
We don't dynamically link the osd.

Signed-off-by: Sage Weil <sage@redhat.com>
Makefile: link mon statically (not .la)
Signed-off-by: Sage Weil <sage@redhat.com>
librados_test_stub: add missing headers
Signed-off-by: Sage Weil <sage@redhat.com>
Makefile: link libos.a statically (no .la)
Signed-off-by: Sage Weil <sage@redhat.com>
rocksdb: 4.1
Signed-off-by: Sage Weil <sage@redhat.com>
rocksdb: build rocksdb with its own Makefile
This lets us track upstream without mantaining our own autotools fork.

Move back to rocksdb vanilla 3.11.2 (without our autotools patches).

Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas force-pushed the wip-rocksdb branch from ca62469 to abde034 Oct 17, 2015

@liewegas

This comment has been minimized.

Copy link
Member Author

liewegas commented Oct 17, 2015

YAY GITBUILDERS ARE HAPPY OMFG AUTOTOOLS AAAAUUUGGGHHHH

@ghost ghost self-assigned this Oct 18, 2015

@ghost

This comment has been minimized.

Copy link

ghost commented Oct 18, 2015

In the end the change is straightforward. Great !

Reviewed-by: Loic Dachary <ldachary@redhat.com>

liewegas added a commit that referenced this pull request Oct 18, 2015

Merge pull request #6290 from ceph/wip-rocksdb
rocksdb: use native rocksdb makefile (and our autotools)

Reviewed-by: Loic Dachary <ldachary@redhat.com>

@liewegas liewegas merged commit 54745c4 into master Oct 18, 2015

@liewegas liewegas deleted the wip-rocksdb branch Oct 18, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.