Merge pull request #9371 from ukernel/wip-osx-fuse

build ceph-fuse on OSX

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/Makefile-client.am
index 59496fc9f91939f6e7586bba1fed8de0c73a4d3c,ed257cd32e8919d9bbbef2b309e9fc1e008ccfcd..62b78c4c36026fa2d87221f0e552ba632bed85f9
--- 1/src/Makefile-client.am
--- 2/src/Makefile-client.am
+++ b/src/Makefile-client.am
@@@ -61,8 -61,8 +61,9 @@@ endif # WITH_RB
  if WITH_FUSE
  ceph_fuse_SOURCES = ceph_fuse.cc
  ceph_fuse_LDADD = $(LIBCLIENT_FUSE) $(CEPH_GLOBAL)
+ ceph_fuse_CXXFLAGS = $(AM_CXXFLAGS) $(LIBFUSE_CFLAGS)
  bin_PROGRAMS += ceph-fuse
 +sbin_SCRIPTS += mount.fuse.ceph
  
  if WITH_RBD
  rbd_fuse_SOURCES = rbd_fuse/rbd-fuse.cc

diff --cc src/global/signal_handler.cc
Simple merge

diff --cc src/kv/MemDB.cc
Simple merge

diff --cc src/librbd/journal/Types.h
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge

diff --cc src/test/Makefile-client.am
Simple merge

diff --cc src/test/encoding/types.h
Simple merge

diff --cc src/tools/rbd_mirror/ImageReplayer.cc
Simple merge