From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
To: keyrings@vger.kernel.org
Cc: "David Howells" <dhowells@redhat.com>,
"Stephan Müller" <smueller@chronox.de>,
"Christophe Vu-Brugier" <cvubrugier@fastmail.fm>
Subject: [PATCH 3/4] Check that keyutils.h has valid C++ syntax at build time
Date: Thu, 02 Jul 2020 08:57:22 +0000 [thread overview]
Message-ID: <20200702085723.7026-4-cvubrugier@fastmail.fm> (raw)
In-Reply-To: <20200702085723.7026-1-cvubrugier@fastmail.fm>
Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
---
Makefile | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 6f79446..949ad7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
CPPFLAGS := -I.
CFLAGS := -g -Wall -Werror
+CXXFLAGS := -g -Wall -Werror
INSTALL := install
DESTDIR : SPECFILE := keyutils.spec
@@ -99,7 +100,7 @@ endif
# Normal build rule
#
###############################################################################
-all: keyctl request-key key.dns_resolver
+all: keyctl request-key key.dns_resolver cxx
###############################################################################
#
@@ -163,6 +164,18 @@ key.dns_resolver: key.dns_resolver.o dns.afsdb.o $(LIB_DEPENDENCY)
key.dns_resolver.o: key.dns_resolver.c key.dns.h
dns.afsdb.o: dns.afsdb.c key.dns.h
+###############################################################################
+#
+# Check that the header file has valid C++ syntax
+#
+###############################################################################
+cxx.stamp: keyutils.h Makefile
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -x c++-header -fsyntax-only $<
+ touch $@
+
+cxx: cxx.stamp
+.PHONY: cxx
+
###############################################################################
#
# Install everything
@@ -244,6 +257,7 @@ clean:
$(RM) keyctl request-key key.dns_resolver
$(RM) *.o *.os *~
$(RM) debugfiles.list debugsources.list
+ $(RM) cxx.stamp
distclean: clean
$(RM) -r rpmbuild $(TARBALL)
--
2.27.0
next prev parent reply other threads:[~2020-07-02 8:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 8:57 [PATCH 0/4] keyutils: fix compilation error with C++ Christophe Vu-Brugier
2020-07-02 8:57 ` [PATCH 1/4] man: fix typos Christophe Vu-Brugier
2020-07-02 8:57 ` [PATCH 2/4] Fix compilation error when keyutils.h is used in C++ Christophe Vu-Brugier
2020-07-02 8:57 ` Christophe Vu-Brugier [this message]
2020-07-02 8:57 ` [PATCH 4/4] Fix error when a C++ program is linked with libkeyutils Christophe Vu-Brugier
2020-07-06 20:27 ` [PATCH 0/4] keyutils: fix compilation error with C++ David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200702085723.7026-4-cvubrugier@fastmail.fm \
--to=cvubrugier@fastmail.fm \
--cc=dhowells@redhat.com \
--cc=keyrings@vger.kernel.org \
--cc=smueller@chronox.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.