summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-06-29 18:56:44 -0700
committerHarshavardhana <harsha@harshavardhana.net>2014-08-07 01:17:29 -0700
commit2ec6ea43f2ddc6c00a030be6d04c00f0924277b7 (patch)
treeb2d98cd8c4760c1af44c8b6a70661fe5566ce6da /contrib
parentf29da9bcc812e3d0711005ce86051d70c277a165 (diff)
build: make GLUSTERD_WORKDIR rely on localstatedir
- Break-way from '/var/lib/glusterd' hard-coded previously, instead rely on 'configure' value from 'localstatedir' - Provide 's/lib/db' as default working directory for gluster management daemon for BSD and Darwin based installations - loff_t is really off_t on Darwin - fix-off the warnings generated by clang on FreeBSD/Darwin - Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all platforms. - Define proper environment for running tests, define correct PATH and LD_LIBRARY_PATH when running tests, so that the desired version of glusterfs is used, regardless where it is installed. (Thanks to manu@netbsd.org for this additional work) Change-Id: I2339a0d9275de5939ccad3e52b535598064a35e7 BUG: 1111774 Signed-off-by: Harshavardhana <harsha@harshavardhana.net> Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/8246 Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/argp-standalone/configure.ac2
-rw-r--r--contrib/fuse-lib/mount.c10
-rw-r--r--contrib/libexecinfo/execinfo_compat.h6
-rw-r--r--contrib/qemu/include/sysemu/os-posix.h2
-rw-r--r--contrib/qemu/util/oslib-posix.c1
5 files changed, 12 insertions, 9 deletions
diff --git a/contrib/argp-standalone/configure.ac b/contrib/argp-standalone/configure.ac
index 98bedc6..c0867eb 100644
--- a/contrib/argp-standalone/configure.ac
+++ b/contrib/argp-standalone/configure.ac
@@ -100,6 +100,6 @@ fi
CPPFLAGS="$CPPFLAGS -I$srcdir"
dnl Added for C99 standards
-CFLAGS="$CFLAGS -std=gnu89"
+CFLAGS="$CFLAGS -std=gnu89 -static"
AC_OUTPUT(Makefile)
diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c
index a7fd94d..1edde86 100644
--- a/contrib/fuse-lib/mount.c
+++ b/contrib/fuse-lib/mount.c
@@ -246,14 +246,16 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
#ifdef __FreeBSD__
struct iovec *iov = NULL;
int iovlen = 0;
+ char fdstr[15];
+ sprintf (fdstr, "%d", fd);
+
build_iovec (&iov, &iovlen, "fstype", "fusefs", -1);
build_iovec (&iov, &iovlen, "subtype", "glusterfs", -1);
- build_iovec (&iov, &iovlen, "fspath", mountpoint, -1);
+ build_iovec (&iov, &iovlen, "fspath", __DECONST(void *, mountpoint),
+ -1);
build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
build_iovec (&iov, &iovlen, "volname", source, -1);
- build_iovec_argf (&iov, &iovlen, "fd", "%d", fd);
- build_iovec_argf (&iov, &iovlen, "user_id", "%d", getuid());
- build_iovec_argf (&iov, &iovlen, "group_id", "%d", getgid());
+ build_iovec (&iov, &iovlen, "fd", fdstr, -1);
ret = nmount (iov, iovlen, mountflags);
#else
ret = mount (source, mountpoint, fstype, mountflags,
diff --git a/contrib/libexecinfo/execinfo_compat.h b/contrib/libexecinfo/execinfo_compat.h
index 85f185d..ae84cfb 100644
--- a/contrib/libexecinfo/execinfo_compat.h
+++ b/contrib/libexecinfo/execinfo_compat.h
@@ -39,9 +39,9 @@
extern "C" {
#endif
-int backtrace(void **, int);
-char **backtrace_symbols(void *const *, int);
-void backtrace_symbols_fd(void *const *, int, int);
+extern int backtrace(void **, int);
+extern char **backtrace_symbols(void *const *, int);
+extern void backtrace_symbols_fd(void *const *, int, int);
#ifdef __cplusplus
}
diff --git a/contrib/qemu/include/sysemu/os-posix.h b/contrib/qemu/include/sysemu/os-posix.h
index 25d0b2a..ed8cbaf 100644
--- a/contrib/qemu/include/sysemu/os-posix.h
+++ b/contrib/qemu/include/sysemu/os-posix.h
@@ -36,7 +36,7 @@ int os_mlock(void);
typedef struct timeval qemu_timeval;
#define qemu_gettimeofday(tp) gettimeofday(tp, NULL)
-#ifndef CONFIG_UTIMENSAT
+#if !defined(CONFIG_UTIMENSAT) || defined(__FreeBSD__)
#ifndef UTIME_NOW
# define UTIME_NOW ((1l << 30) - 1l)
#endif
diff --git a/contrib/qemu/util/oslib-posix.c b/contrib/qemu/util/oslib-posix.c
index 5dceea5..77cb9b7 100644
--- a/contrib/qemu/util/oslib-posix.c
+++ b/contrib/qemu/util/oslib-posix.c
@@ -50,6 +50,7 @@ extern int daemon(int, int);
#include <glib/gprintf.h>
#include "config-host.h"
+#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "trace.h"
#include "qemu/sockets.h"