![Romain Naour](/assets/img/avatar_default.png)
Upstream added -Wno-nonnull-compare to disable this error [1].
Fixes:
libfaketime.c:513:7: error : nonnull argument « buf » compared to NULL [-Werror=nonnull-compare]
if (buf != NULL)
^
[1] 47e958b753
[Peter: add upstream git commit id to patch]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From e85a157b51b1276c91c736d8624d9f3e876e9189 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Rammhold <andreas@rammhold.de>
|
|
Date: Tue, 20 Dec 2016 19:25:32 +0100
|
|
Subject: [PATCH] Disable the non-null compare warning/error.
|
|
|
|
We rely on the provided local library definitions for the hooked
|
|
functions which in some cases (GCC >6) carry a non-null-attribute flag
|
|
which causes compile errors on `!= NULL` checks.
|
|
|
|
[Romain: rebase on 0.9.6]
|
|
(cherry picked from commit 47e958b753fc15098a2b7d0e9ef26b83ee255874)
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
---
|
|
src/Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index 51634b0..bbbd476 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -67,7 +67,7 @@ INSTALL ?= install
|
|
PREFIX ?= /usr/local
|
|
LIBDIRNAME ?= /lib/faketime
|
|
|
|
-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
|
|
+CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
|
|
LIB_LDFLAGS += -shared
|
|
LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread
|
|
LDADD += -ldl -lm -lrt
|
|
--
|
|
2.9.3
|
|
|