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.

Sign up for GitHub

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

Jump to bottom

src: Allow compilation of librbd on MacOS #1

Merged
merged 3 commits into from
Jan 15, 2024
Merged

src: Allow compilation of librbd on MacOS #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f578c0
src: various fixes to compile RBD on macOs
aainscow Jan 10, 2024
64f5ec2
Add long constructor for json_spirit
aainscow Jan 15, 2024
1ebfbd6
Disable Jaeger tracing by default for MAC
aainscow Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion do_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ elif [ "$(uname)" == Darwin ] ; then
ARGS+=" -DWITH_BLUESTORE=OFF"
ARGS+=" -DWITH_LTTNG=OFF"
ARGS+=" -DWITH_BABELTRACE=OFF"
ARGS+=" -DWITH_RBD=OFF"
ARGS+=" -DWITH_KRBD=OFF"
ARGS+=" -DWITH_RADOSGW_AMQP_ENDPOINT=OFF"
ARGS+=" -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF"
# currently, rgw posix driver requires inotify
ARGS+=" -DWITH_RADOSGW_POSIX=OFF"
ARGS+=" -DWITH_JAEGER=OFF"

# you should have configured and bootstrapped brew
ARGS+=" -DICU_ROOT=$(brew --prefix icu4c)"
Expand Down
7 changes: 7 additions & 0 deletions src/json_spirit/json_spirit_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ namespace json_spirit
Value_impl( const Array& value );
Value_impl( bool value );
Value_impl( int value );
Value_impl( long value );
Value_impl( boost::int64_t value );
Value_impl( boost::uint64_t value );
Value_impl( double value );
Expand Down Expand Up @@ -295,6 +296,12 @@ namespace json_spirit
{
}

template < class Config >
Value_impl< Config >::Value_impl( long value )
: v_( static_cast< boost::int64_t >( value ) )
{
}

template< class Config >
Value_impl< Config >::Value_impl( boost::int64_t value )
: v_( value )
Expand Down
4 changes: 2 additions & 2 deletions src/rbd_fuse/rbd-fuse.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ int
rbdfs_setxattr(const char *path, const char *name, const char *value,
size_t size,
int flags
#if defined(DARWIN)
#if defined(__APPLE__)
,uint32_t pos
#endif
)
Expand All @@ -701,7 +701,7 @@ rbdfs_setxattr(const char *path, const char *name, const char *value,
int
rbdfs_getxattr(const char *path, const char *name, char *value,
size_t size
#if defined(DARWIN)
#if defined(__APPLE__)
,uint32_t position
#endif
)
Expand Down
1 change: 1 addition & 0 deletions src/test/librbd/migration/test_mock_QCOWFormat.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "json_spirit/json_spirit.h"
#include "include/endian_compat.h"

namespace librbd {
namespace {
Expand Down
Loading