From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 2 Jul 2020 09:15:51 +0000 (+0000)
Subject: travis: turn on -Werror
X-Git-Tag: v2.36-rc2~19^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b81644f104734713d4fe879858b07c204c52747;p=thirdparty%2Futil-linux.git

travis: turn on -Werror
---

diff --git a/.travis-functions.sh b/.travis-functions.sh
index 805a5104ff..d8908670e7 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -74,6 +74,8 @@ function check_nonroot
 		make_opts="$make_opts --memcheck-asan"
 	fi
 
+	conf_opts="$conf_opts --enable-werror"
+
 	xconfigure $conf_opts || return
 	$MAKE || return
 
@@ -97,6 +99,8 @@ function check_root
 		make_opts="$make_opts --memcheck-asan"
 	fi
 
+	conf_opts="$conf_opts --enable-werror"
+
 	xconfigure $conf_opts || return
 	$MAKE || return
 
diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c
index 11e90fb0ef..2e00a2823a 100644
--- a/sys-utils/blkzone.c
+++ b/sys-utils/blkzone.c
@@ -256,7 +256,14 @@ static int blkzone_report(struct blkzone_control *ctl)
 			break;
 
 		for (i = 0; i < zi->nr_zones; i++) {
+/*
+ * blk_zone_report hasn't been packed since https://github.com/torvalds/linux/commit/b3e7e7d2d668de0102264302a4d10dd9d4438a42
+ * was merged. See https://github.com/karelzak/util-linux/issues/1083
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
 			const struct blk_zone *entry = &zi->zones[i];
+#pragma GCC diagnostic pop
 			unsigned int type = entry->type;
 			uint64_t start = entry->start;
 			uint64_t wp = entry->wp;