diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2018-08-28 23:07:04 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-08-29 18:18:14 -0700 |
| commit | b3f3251273cf2ed97e597de00eda5c8cf9538567 (patch) | |
| tree | 6b99b93e544214bbfad76a97ad94efa0a40cb757 /meta-networking | |
| parent | 48b61ca65257b03b19cfdb4cdb2ff57e0804abc0 (diff) | |
| download | meta-openembedded-contrib-b3f3251273cf2ed97e597de00eda5c8cf9538567.tar.gz | |
civetweb: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch | 26 | ||||
| -rw-r--r-- | meta-networking/recipes-connectivity/civetweb/civetweb_git.bb | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch new file mode 100644 index 0000000000..8653302130 --- /dev/null +++ b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch @@ -0,0 +1,26 @@ +From 59f65235a7a690f50d1686e9977908c053697d8c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 Aug 2018 22:59:13 -0700 +Subject: [PATCH] undefine macro before redefining + +Fixes +src/main.c:89:9: error: 'printf' macro redefined [-Werror,-Wmacro-redefined] + +Upstream-Stats: Submitted [https://github.com/civetweb/civetweb/pull/649] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.c b/src/main.c +index bbcb0aec..01191a3c 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -86,6 +86,7 @@ + + #include "civetweb.h" + ++#undef printf + #define printf \ + DO_NOT_USE_THIS_FUNCTION__USE_fprintf /* Required for unit testing */ + diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb index 471a665099..9a7844ad04 100644 --- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb @@ -8,7 +8,8 @@ SRCREV = "19f31ba8dd8443e86c7028a4b4c37f4b299aa68c" PV = "1.10+git${SRCPV}" SRC_URI = "git://github.com/civetweb/civetweb.git \ file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ - " + file://0001-undefine-macro-before-redefining.patch \ + " S = "${WORKDIR}/git" |