From: Boris Ranto Date: Fri, 15 Aug 2014 17:34:27 +0000 (+0200) Subject: Fix -Wno-format and -Werror=format-security options clash X-Git-Tag: v0.85~34 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7df67a544f6401fd31157b6e2a6ca590d87d7cbc;p=ceph.git Fix -Wno-format and -Werror=format-security options clash This causes build failure in latest fedora builds, ceph_test_librbd_fsx adds -Wno-format cflag but the default AM_CFLAGS already contain -Werror=format-security, in previous releases, this was tolerated but in the latest fedora rawhide it no longer is, ceph_test_librbd_fsx builds fine without -Wno-format on x86_64 so there is likely no need for the flag anymore Signed-off-by: Boris Ranto Reviewed-by: Sage Weil --- diff --git a/src/test/Makefile.am b/src/test/Makefile.am index e58d556faf80..58d3a42669de 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -658,7 +658,7 @@ if LINUX # Force use of C++ linker with dummy.cc - LIBKRBD is a C++ library ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c common/dummy.cc ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS) -ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format +ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} bin_DEBUGPROGRAMS += ceph_test_librbd_fsx endif