andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NetBSD build fixes

Browse Source 
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>

Change-Id: I8f9aabeadd2f842521a82e59594115bd80155d68
BUG: 2923
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.com/3053
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Emmanuel Dreyfus 2012-03-30 15:58:43 +02:00 committed by Anand Avati
parent 92baa61bfe
commit 7313b22f10
8 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/cli-cmd-volume.c
View File

@ -1460,11 +1460,13 @@ cli_get_detail_status (dict_t *dict, int i, cli_volume_status_t *status)
if (!status->total)
goto out;
#ifdef GF_LINUX_HOST_OS
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "brick%d.device", i);
ret = dict_get_str (dict, key, &(status->device));
if (ret)
status->device = NULL;
#endif
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "brick%d.block_size", i);

10
configure.ac
View File

@ -394,6 +394,11 @@ dnl Linux, Solaris, Cygwin
AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec])
dnl FreeBSD, NetBSD
AC_CHECK_MEMBERS([struct stat.st_atimespec.tv_nsec])
case $host_os in
*netbsd*)
CFLAGS=-D_INCOMPLETE_XOPEN_C063
;;
esac
AC_CHECK_FUNC([linkat], [have_linkat=yes])
if test "x${have_linkat}" = "xyes"; then
AC_DEFINE(HAVE_LINKAT, 1, [define if found linkat])
@ -474,8 +479,9 @@ case $host_os in
if test "x$ac_cv_header_execinfo_h" = "xyes"; then
GF_GLUSTERFS_LDFLAGS="-lexecinfo"
fi
GF_FUSE_LDADD="-liconv -lperfuse"
BUILD_FUSE_CLIENT=no
GF_FUSE_LDADD="-lperfuse"
BUILD_FUSE_CLIENT=yes
LEXLIB=""
;;
*bsd*)
GF_HOST_OS="GF_BSD_HOST_OS"

1
libglusterfs/src/run.c
View File

@ -30,6 +30,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <assert.h>
#include <signal.h>
#include <sys/wait.h>
#include <sys/resource.h>

1
rpc/rpc-lib/src/xdr-common.h
View File

@ -56,6 +56,7 @@ enum gf_dump_procnum {
#define xdr_u_quad_t xdr_u_int64_t
#define xdr_quad_t xdr_int64_t
#define xdr_uint32_t xdr_u_int32_t
#define xdr_uint64_t xdr_u_int64_t
#endif

1
rpc/xdr/src/xdr-nfs3.c
View File

@ -19,6 +19,7 @@
#include "xdr-nfs3.h"
#include "mem-pool.h"
#include "xdr-common.h"
#if GF_DARWIN_HOST_OS
#define xdr_u_quad_t xdr_u_int64_t

3
xlators/mount/fuse/src/fuse-helpers.c
View File

@ -24,6 +24,9 @@
#include <sys/sysctl.h>
#endif
#ifndef GF_REQUEST_MAXGROUPS
#define GF_REQUEST_MAXGROUPS 16
#endif /* GF_REQUEST_MAXGROUPS */
static void
fuse_resolve_wipe (fuse_resolve_t *resolve)

3
xlators/mount/fuse/utils/mount_glusterfs.in
View File

@ -85,7 +85,7 @@ start_glusterfs ()
--volfile-server-transport=$transport");
else
cmd_line=$(echo "$cmd_line \
--volfile-server=$server_ip \
--volfile-server=$server_ip");
fi
else
cmd_line=$(echo "$cmd_line --volfile=$volfile_loc");
@ -173,6 +173,7 @@ main ()
[ -r "$volfile_loc" ] || {
server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:.\-]*\):.*/\1/p');
volume_id=$(echo "$volfile_loc" | sed -n 's/[a-zA-Z0-9:.\-]*:\(.*\)/\1/p');
volfile_loc="";
}
# following line is product of love towards sed

2
xlators/storage/posix/src/posix-handle.c
View File

@ -27,7 +27,9 @@
#include <sys/stat.h>
#include <unistd.h>
#include <libgen.h>
#ifdef GF_LINUX_HOST_OS
#include <alloca.h>
#endif
#include "posix-handle.h"
#include "posix.h"