From 7a8b6fb4c7b80c33dd3565fc4140d45fe70f0438 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 15 Aug 2014 19:34:27 +0200 Subject: [PATCH] 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 (cherry picked from commit 7df67a544f6401fd31157b6e2a6ca590d87d7cbc) Conflicts: src/test/Makefile.am --- src/test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 69f9e841f5163..9ede2758cc05f 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd if LINUX ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm -ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format +ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} bin_DEBUGPROGRAMS += ceph_test_librbd_fsx endif -- 2.39.5