summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshishir gowda <shishirng@gluster.com>2011-02-17 07:31:18 +0000
committerAnand V. Avati <avati@dev.gluster.com>2011-02-22 02:11:25 -0800
commit65e5cc0f394e1d2faaab3dc5d097a3f01b03dd41 (patch)
tree5a3c2a80a398c9500334d2178036a4421c349905
parent46f0277dfcca246b12700b2c6893abcc14480623 (diff)
Solaris build fixes
Disable geosync build for non-linux platforms. And fix solaris related build failures.The symbol getxattr was not available on solaris. The build on linux passed as getxattr symbol was available in the library. The argument was not being used, hence removed it. Make 64 bit build default in CFLAGS option by passing -m64 option Signed-off-by: Shishir Gowda <shishirng@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 2440 (Fix solaris build issues seen on latest git) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2440
-rw-r--r--configure.ac12
-rw-r--r--xlators/cluster/afr/src/afr-inode-read.c2
-rw-r--r--xlators/cluster/dht/src/dht-common.c2
-rw-r--r--xlators/cluster/stripe/src/stripe.c2
-rw-r--r--xlators/lib/src/libxlator.c5
-rw-r--r--xlators/lib/src/libxlator.h2
6 files changed, 17 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index a0fcbaa4d0e..1a261a2404a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,16 @@ AC_ARG_ENABLE([georeplication],
[Do not install georeplication components]))
BUILD_SYNCDAEMON=no
+case $host_os in
+ linux*)
+#do nothing
+ ;;
+ *)
+#disabling geo replication for non-linux platforms
+ enable_georeplication=no
+ ;;
+esac
+
if test "x$enable_georeplication" != "xno"; then
SYNCDAEMON_SUBDIR=utils
BUILD_SYNCDAEMON="yes"
@@ -394,7 +404,7 @@ case $host_os in
;;
solaris*)
GF_HOST_OS="GF_SOLARIS_HOST_OS"
- GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O0"
+ GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O0 -m64"
GF_LDFLAGS=""
GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
GF_LDADD="${ARGP_STANDALONE_LDADD}"
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c
index ce6a6a363ed..d2089db8ed4 100644
--- a/xlators/cluster/afr/src/afr-inode-read.c
+++ b/xlators/cluster/afr/src/afr-inode-read.c
@@ -657,7 +657,7 @@ out:
}
int32_t
-afr_getxattr_unwind (void *arg, call_frame_t *frame,
+afr_getxattr_unwind (call_frame_t *frame,
int op_ret, int op_errno, dict_t *dict)
{
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 14316b37071..18f15696b16 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -1837,7 +1837,7 @@ out:
}
int32_t
-dht_getxattr_unwind (void *getxattr, call_frame_t *frame,
+dht_getxattr_unwind (call_frame_t *frame,
int op_ret, int op_errno, dict_t *dict)
{
DHT_STACK_UNWIND (getxattr, frame, op_ret, op_errno, dict);
diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c
index cc34a84684c..c251de13755 100644
--- a/xlators/cluster/stripe/src/stripe.c
+++ b/xlators/cluster/stripe/src/stripe.c
@@ -3945,7 +3945,7 @@ out:
}
int32_t
-stripe_getxattr_unwind (void *getxattr, call_frame_t *frame,
+stripe_getxattr_unwind (call_frame_t *frame,
int op_ret, int op_errno, dict_t *dict)
{
diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c
index e7bbe04baa1..bd0e11d2134 100644
--- a/xlators/lib/src/libxlator.c
+++ b/xlators/lib/src/libxlator.c
@@ -203,7 +203,7 @@ done:
out:
if (local->xl_specf_unwind) {
frame->local = local->xl_local;
- local->xl_specf_unwind (getxattr, frame, op_ret,
+ local->xl_specf_unwind (frame, op_ret,
op_errno, dict);
return 0;
}
@@ -225,7 +225,6 @@ cluster_markeruuid_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
struct marker_str *marker = NULL;
char *vol_uuid;
-
if (!this || !frame || !cookie) {
gf_log (this->name, GF_LOG_DEBUG, "possible NULL deref");
goto out;
@@ -343,7 +342,7 @@ done:
out:
if (marker->xl_specf_unwind) {
frame->local = marker->xl_local;
- marker->xl_specf_unwind (getxattr, frame, op_ret,
+ marker->xl_specf_unwind (frame, op_ret,
op_errno, dict);
return 0;
}
diff --git a/xlators/lib/src/libxlator.h b/xlators/lib/src/libxlator.h
index 0187e876bda..c5e564faff5 100644
--- a/xlators/lib/src/libxlator.h
+++ b/xlators/lib/src/libxlator.h
@@ -24,7 +24,7 @@
#define MARKER_XTIME_TYPE 2
-typedef int32_t (*xlator_specf_unwind_t) (void *getxattr, call_frame_t *frame,
+typedef int32_t (*xlator_specf_unwind_t) (call_frame_t *frame,
int op_ret, int op_errno, dict_t *dict);