You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
2.4 KiB
75 lines
2.4 KiB
10 years ago
|
Index: cli/src/Makefile.in
|
||
|
|
--- cli/src/Makefile.in.orig 2015-08-31 19:29:38.988821000 +0200
|
||
|
|
+++ cli/src/Makefile.in 2015-09-18 23:20:26.137755806 +0200
|
||
|
|
@@ -63,8 +63,8 @@
|
||
|
|
gluster_DEPENDENCIES = \
|
||
|
|
$(top_builddir)/libglusterfs/src/libglusterfs.la \
|
||
|
|
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||
|
|
- $(top_builddir)/rpc/xdr/src/libgfxdr.la \
|
||
|
|
$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
|
||
|
|
+ $(top_builddir)/rpc/xdr/src/libgfxdr.la \
|
||
|
|
$(am__DEPENDENCIES_1)
|
||
|
|
AM_V_lt = $(am__v_lt_$(V))
|
||
|
|
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
|
||
|
|
@@ -327,8 +327,8 @@
|
||
|
|
cli-cmd-system.c cli-cmd-misc.c cli-xml-output.c cli-quotad-client.c cli-cmd-snapshot.c
|
||
|
|
|
||
|
|
gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD) \
|
||
|
|
- $(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
|
||
|
|
$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
|
||
|
|
+ $(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la \
|
||
|
|
$(XML_LIBS)
|
||
|
|
|
||
|
|
gluster_LDFLAGS = $(GF_LDFLAGS)
|
||
|
|
Index: configure
|
||
|
|
--- configure.orig 2015-08-31 19:29:36.175863000 +0200
|
||
|
|
+++ configure 2015-09-18 23:20:12.335748777 +0200
|
||
|
|
@@ -14619,7 +14619,7 @@
|
||
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
||
|
|
/* end confdefs.h. */
|
||
|
|
$ac_includes_default
|
||
|
|
-#include <uuid.h>
|
||
|
|
+#include "uuid.h"
|
||
|
|
_ACEOF
|
||
|
|
rm -f conftest.$ac_objext
|
||
|
|
if { (ac_try="$ac_compile"
|
||
|
|
@@ -14660,7 +14660,7 @@
|
||
|
|
cat confdefs.h >>conftest.$ac_ext
|
||
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
||
|
|
/* end confdefs.h. */
|
||
|
|
-#include <uuid.h>
|
||
|
|
+#include "uuid.h"
|
||
|
|
_ACEOF
|
||
|
|
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||
|
|
case "(($ac_try" in
|
||
|
|
@@ -19829,7 +19829,7 @@
|
||
|
|
GF_LDFLAGS="-rdynamic"
|
||
|
|
|
||
|
|
saved_CFLAGS=$CFLAGS
|
||
|
|
-CFLAGS="-Wformat -Werror=format-security"
|
||
|
|
+CFLAGS=""
|
||
|
|
{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -Werror=format-security" >&5
|
||
|
|
$as_echo_n "checking whether $CC accepts -Werror=format-security... " >&6; }
|
||
|
|
cat >conftest.$ac_ext <<_ACEOF
|
||
|
|
@@ -19883,7 +19883,7 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
saved_CFLAGS=$CFLAGS
|
||
|
|
-CFLAGS="-Werror=implicit-function-declaration"
|
||
|
|
+CFLAGS=""
|
||
|
|
{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -Werror=implicit-function-declaration" >&5
|
||
|
|
$as_echo_n "checking whether $CC accepts -Werror=implicit-function-declaration... " >&6; }
|
||
|
|
cat >conftest.$ac_ext <<_ACEOF
|
||
|
|
Index: libglusterfs/src/compat-uuid.h
|
||
|
|
--- libglusterfs/src/compat-uuid.h.orig 2015-08-31 19:29:27.415993000 +0200
|
||
|
|
+++ libglusterfs/src/compat-uuid.h 2015-09-18 23:20:12.335748777 +0200
|
||
|
|
@@ -13,7 +13,7 @@
|
||
|
|
|
||
|
|
#if defined(HAVE_LIBUUID) /* Linux like libuuid.so */
|
||
|
|
|
||
|
|
-#include <uuid.h>
|
||
|
|
+#include "uuid.h"
|
||
|
|
|
||
|
|
static inline void
|
||
|
|
gf_uuid_clear (uuid_t uuid)
|