diff --git a/0009-disable-Werror-building.patch b/0009-disable-Werror-building.patch new file mode 100644 index 0000000..277551e --- /dev/null +++ b/0009-disable-Werror-building.patch @@ -0,0 +1,23 @@ +From: Johannes Thumshirn +Date: Tue Apr 11 11:08:13 CEST 2017 +Subject: Disable Werror building + +Disbale the -Werror compiler flag due to a new warning in GCC 7. Although the +warning is legitim it is a false positive in this place. + +Signed-off-by: Johannes Thumshirn +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ sbin_PROGRAMS = fcoeadm fcoemon fcping f + AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include + ## pass the sysconfdir into the C proprocessor + AM_CPPFLAGS += -DSYSCONFDIR="\"${sysconfdir}\"" -D_FORTIFY_SOURCE=2 +-AM_CFLAGS = -Wall -Wformat=2 -Werror -Wmissing-prototypes -Wstrict-prototypes ++AM_CFLAGS = -Wall -Wformat=2 -Wmissing-prototypes -Wstrict-prototypes + + ## rules for building fcoeadm + fcoeadm_SOURCES = fcoeadm.c fcoeadm_display.c diff --git a/fcoe-utils-1.0.29-make.patch b/fcoe-utils-1.0.29-make.patch index b31f7ae..f8eb1f1 100644 --- a/fcoe-utils-1.0.29-make.patch +++ b/fcoe-utils-1.0.29-make.patch @@ -1,5 +1,7 @@ -diff --git a/Makefile.am b/Makefile.am -index 5cbc15f..57bdbdb 100644 +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ @@ -10,4 +12,4 @@ index 5cbc15f..57bdbdb 100644 +AM_CPPFLAGS = -I${srcdir}/include -I${builddir}/include -I/lib/modules/`rpm -q --list kernel | grep "^/lib/modules/.*/build$$" | cut -f4 -d"/" | sort -r | head -1`/build/include ## pass the sysconfdir into the C proprocessor AM_CPPFLAGS += -DSYSCONFDIR="\"${sysconfdir}\"" -D_FORTIFY_SOURCE=2 - AM_CFLAGS = -Wall -Wformat=2 -Werror -Wmissing-prototypes -Wstrict-prototypes + AM_CFLAGS = -Wall -Wformat=2 -Wmissing-prototypes -Wstrict-prototypes diff --git a/fcoe-utils.changes b/fcoe-utils.changes index b4fe92c..3f2fc0a 100644 --- a/fcoe-utils.changes +++ b/fcoe-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 11 09:10:32 UTC 2017 - jthumshirn@suse.com + +- Disable Werror when building to work around a new GCC 7 warning. (bsc#1030244) + + 0009-disable-Werror-building.patch + ------------------------------------------------------------------- Thu Feb 9 08:54:54 UTC 2017 - jthumshirn@suse.com diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 08da093..92d73c4 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -43,6 +43,7 @@ Patch4: 0004-fcoemon-Correctly-handle-options-in-the-service-file.patch Patch5: 0005-fcoe.service-Add-foreground-to-prevent-fcoemon-to-be.patch Patch6: 0006-fipvlan-fixup-return-value-on-error.patch Patch8: 0008-Use-correct-socket-for-fcoemon.socket.patch +Patch9: 0009-disable-Werror-building.patch Patch12: 0012-fcoemon-Retry-fcm_link_getlink-on-EBUSY.patch # Patches from Fedora @@ -61,6 +62,7 @@ connections. %patch5 -p1 %patch6 -p1 %patch8 -p1 +%patch9 -p1 %patch12 -p1 %patch101 -p1