diff options
| -rw-r--r-- | debian/patches/debian-no-Werror.diff | 24 | ||||
| -rw-r--r-- | debian/patches/debian/0007-no-Werror.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 19 insertions, 25 deletions
diff --git a/debian/patches/debian-no-Werror.diff b/debian/patches/debian-no-Werror.diff deleted file mode 100644 index 371df52..0000000 --- a/debian/patches/debian-no-Werror.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: martin f. krafft <madduck@debian.org> -Subject: Remove -Werror from compiler flags - --Werror seems like a bad idea on released/packaged code because a toolchain -update (introducing new warnings) could break the build. We'll let upstream -use it to beautify the code, but remove it for out builds. - -Signed-off-by: martin f. krafft <madduck@debian.org> - ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) - CC := $(CROSS_COMPILE)gcc - endif - CXFLAGS ?= -ggdb --CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter - ifdef WARN_UNUSED - CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 - endif diff --git a/debian/patches/debian/0007-no-Werror.patch b/debian/patches/debian/0007-no-Werror.patch new file mode 100644 index 0000000..2321e26 --- /dev/null +++ b/debian/patches/debian/0007-no-Werror.patch @@ -0,0 +1,18 @@ +Author: Martin F. Krafft <madduck@debian.org> +Description: Remove -Werror from compiler flags. + -Werror seems like a bad idea on released/packaged code because a toolchain + update (introducing new warnings) could break the build. We'll let upstream + use it to beautify the code, but remove it for out builds. + +diff -Naurp mdadm.orig/Makefile mdadm/Makefile +--- mdadm.orig/Makefile ++++ mdadm/Makefile +@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) + CC := $(CROSS_COMPILE)gcc + endif + CXFLAGS ?= -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 + endif diff --git a/debian/patches/series b/debian/patches/series index b07b693..d08c03d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,5 +4,5 @@ debian/0003-host-name-in-default-mailfrom.patch debian/0004-exit-gracefully-when-md-device-not-found.patch debian/0005-sha1-includes.patch debian/0006-readlink-path.patch -debian-no-Werror.diff +debian/0007-no-Werror.patch test-installed.patch |