diff --git a/build/makelib/cephd.mk b/build/makelib/cephd.mk index 31c56c83a..e71afc0fc 100644 --- a/build/makelib/cephd.mk +++ b/build/makelib/cephd.mk @@ -43,8 +43,10 @@ CEPHD_CMAKE += \ -DALLOCATOR=$(CEPHD_ALLOCATOR) \ -DWITH_FUSE=OFF \ -DWITH_NSS=OFF \ + -DWITH_SSL=OFF \ -DWITH_SYSTEM_BOOST=ON \ -DWITH_SYSTEM_ROCKSDB=ON \ + -DWITH_SYSTEM_ZSTD=ON \ -DUSE_CRYPTOPP=ON \ -DWITH_LEVELDB=OFF \ -DWITH_XFS=OFF \ @@ -55,7 +57,8 @@ CEPHD_CMAKE += \ -DWITH_MGR=OFF \ -DWITH_RADOSGW_FCGI_FRONTEND=OFF \ -DWITH_RADOSGW_ASIO_FRONTEND=OFF \ - -DWITH_PYTHON3=OFF + -DWITH_PYTHON3=OFF \ + -DWITH_KRBD=OFF ifeq ($(CEPHD_CCACHE),1) CEPHD_CMAKE += -DWITH_CCACHE=ON diff --git a/ceph b/ceph index b7551f136..2197ed911 160000 --- a/ceph +++ b/ceph @@ -1 +1 @@ -Subproject commit b7551f136a37e895a4eb7c185a03c58aa260b2a9 +Subproject commit 2197ed911feb895ff2023eecf45c8831134b9922 diff --git a/pkg/cephmgr/cephd/cephd.go b/pkg/cephmgr/cephd/cephd.go index fb869a36e..3945880e8 100644 --- a/pkg/cephmgr/cephd/cephd.go +++ b/pkg/cephmgr/cephd/cephd.go @@ -50,9 +50,9 @@ package cephd // #cgo tcmalloc,stdlib 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: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcryptopp -lrocksdb -laio -luuid -lcurl -lexpat -lm -ldl -lresolv -// #cgo stdlib LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcryptopp -lrocksdb -laio -luuid -lcurl -lexpat -Wl,-Bdynamic -ldl -lm -lresolv -// #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -Wl,-Bdynamic -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lz -lsnappy -lcryptopp -lrocksdb -laio -luuid -lcurl -lexpat -ldl -lm -lresolv +// #cgo static LDFLAGS: -Wl,--whole-archive -lpthread -Wl,--no-whole-archive -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lrocksdb -lcurl -lz -lsnappy -lzstd -lcryptopp -lssl -lcrypto -laio -luuid -lexpat -lm -ldl -lresolv +// #cgo stdlib LDFLAGS: -Wl,-Bstatic -lcephd -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lrocksdb -lcurl -lz -lsnappy -lzstd -lcryptopp -lssl -lcrypto -laio -luuid -lexpat -Wl,-Bdynamic -ldl -lm -lresolv +// #cgo dynamic LDFLAGS: -Wl,-Bstatic -lcephd -Wl,-Bdynamic -lboost_system -lboost_thread -lboost_iostreams -lboost_random -lblkid -lcurl -lrocksdb -lz -lsnappy -lzstd -lcryptopp -lssl -lcrypto -laio -luuid -lexpat -ldl -lm -lresolv // #include // #include // #include