From 89196cc3e4d882d3e776d594fa0db1372ae4b3f6 Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Tue, 1 Nov 2016 16:24:33 -0700 Subject: [PATCH 1/2] fix segfault with bluestore mkfs --- pkg/cephmgr/cephd/cephd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cephmgr/cephd/cephd.go b/pkg/cephmgr/cephd/cephd.go index e5e5c88dd..987d47ba4 100644 --- a/pkg/cephmgr/cephd/cephd.go +++ b/pkg/cephmgr/cephd/cephd.go @@ -7,7 +7,7 @@ package cephd // #cgo tcmalloc,dynamic LDFLAGS: -Wl,-Bstatic -ltcmalloc_minimal -Wl,-Bdynamic // #cgo jemalloc tcmalloc CFLAGS: -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free // #cgo jemalloc tcmalloc CXXFLAGS: -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -// #cgo static LDFLAGS: -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -lleveldb -laio -luuid -lm -ldl -lresolv +// #cgo static LDFLAGS: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -lleveldb -laio -luuid -lm -ldl -lresolv // #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcrypto++ -lleveldb -laio -luuid -Wl,-Bdynamic -ldl -lm -lresolv // #include // #include From 541fcda45f62128d0d28ab2ecb44a767dcb90c1b Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Wed, 2 Nov 2016 12:25:57 -0700 Subject: [PATCH 2/2] ceph: pickup new ceph commit --- ceph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph b/ceph index 1d0c72e29..dc39f4b4f 160000 --- a/ceph +++ b/ceph @@ -1 +1 @@ -Subproject commit 1d0c72e293c1bc68334f56c6132a9c80140350b8 +Subproject commit dc39f4b4f761f5eb5b22cc3802331345f432e2f9