blob: 906ec99a9d0459e384f903e921c1b37d380a631e [file] [log] [blame]
Andrew Geisslere34f8962021-04-15 15:53:51 -05001From 7317aba872f2bcf052a7db9fa3c7a7ce3c55dc6b Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08002From: Benjamin Berg <bberg@redhat.com>
3Date: Mon, 21 Aug 2017 10:34:40 +0200
Andrew Geisslere34f8962021-04-15 15:53:51 -05004Subject: [PATCH 3/6] Remove -Werror from build
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08005
6Upstream-Status: Pending
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08007---
8 src/Makefile.am | 2 +-
9 src/lib/src/Makefile.am | 2 +-
10 src/utilities/Makefile.am | 2 +-
11 3 files changed, 3 insertions(+), 3 deletions(-)
12
Andrew Geisslere34f8962021-04-15 15:53:51 -050013diff --git a/src/Makefile.am b/src/Makefile.am
14index a26a197b..70a28174 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080015--- a/src/Makefile.am
16+++ b/src/Makefile.am
17@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
Brad Bishop26bdd442019-08-16 17:08:17 -040018 `pkg-config --silence-errors --cflags json` \
19 `pkg-config --silence-errors --cflags json-c` \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020 -pthread `pkg-config --cflags glib-2.0 gio-2.0` \
Brad Bishop26bdd442019-08-16 17:08:17 -040021- -Wall -Werror -Wextra \
Andrew Geisslerbffdb3e2020-08-21 16:13:29 -050022+ -Wall -Wextra \
23 -Wno-address-of-packed-member \
24 -Wfloat-equal -Wmissing-declarations \
25 -Wno-long-long -Wredundant-decls -Wshadow \
Andrew Geisslere34f8962021-04-15 15:53:51 -050026diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
27index 55c52b41..b85d0101 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080028--- a/src/lib/src/Makefile.am
29+++ b/src/lib/src/Makefile.am
Andrew Geisslerbffdb3e2020-08-21 16:13:29 -050030@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080031 `pkg-config --silence-errors --cflags json-c` \
32 `pkg-config --cflags glib-2.0 gio-2.0` \
33 -DDATAROOTDIR=\"$(datarootdir)\" \
Brad Bishop26bdd442019-08-16 17:08:17 -040034- -Wall -Werror -Wextra \
35+ -Wall -Wextra \
36 -Wno-address-of-packed-member
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080037
38 pkglib_LTLIBRARIES = libfwts.la
Andrew Geisslere34f8962021-04-15 15:53:51 -050039diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am
40index ecc25f0a..129c1036 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080041--- a/src/utilities/Makefile.am
42+++ b/src/utilities/Makefile.am
43@@ -16,7 +16,7 @@
44 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
45 #
46
47-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
48+AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \
49 `pkg-config --silence-errors --cflags json` \
Andrew Geisslere34f8962021-04-15 15:53:51 -050050 `pkg-config --silence-errors --cflags json-c` \
51 -I../lib/include
52--
532.25.1
54