All of lore.kernel.org
 help / color / mirror / Atom feed
From: "akuster" <akuster808@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [gatesgarth 19/31] spdlog: Fix recipe so other recipes can use spdlog with external fmt.
Date: Sun, 17 Jan 2021 09:36:24 -0800	[thread overview]
Message-ID: <243f73385af8dbdc3fecd49627c56d0df54e36a6.1610904793.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1610904792.git.akuster808@gmail.com>

From: Philip Balister <philip@balister.org>

* I enabled the shared library option to eliminate linker issues
   with a package that used spdlog.
 * Edited the tweak.h file so programs use the external fmt library
   headers, not the oners in spdlog.

Signed-off-by: Philip Balister <philip@opensdr.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 010cd128e7ae8258f83c03195caa605bbce3e76b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...1-Enable-use-of-external-fmt-library.patch | 26 +++++++++++++++++++
 .../recipes-support/spdlog/spdlog_1.8.1.bb    |  5 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch

diff --git a/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch b/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch
new file mode 100644
index 0000000000..b62b379a76
--- /dev/null
+++ b/meta-oe/recipes-support/spdlog/files/0001-Enable-use-of-external-fmt-library.patch
@@ -0,0 +1,26 @@
+From 23ce2fe30e7485d48e2864bdd8276119fbb8cbd1 Mon Sep 17 00:00:00 2001
+From: Philip Balister <philip@balister.org>
+Date: Thu, 3 Dec 2020 09:22:50 -0500
+Subject: [PATCH] Enable use of external fmt library.
+
+Signed-off-by: Philip Balister <philip@balister.org>
+---
+ include/spdlog/tweakme.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
+index 244bc3b3..2594a6fe 100644
+--- a/include/spdlog/tweakme.h
++++ b/include/spdlog/tweakme.h
+@@ -63,7 +63,7 @@
+ // In this case spdlog will try to include <fmt/format.h> so set your -I flag
+ // accordingly.
+ //
+-// #define SPDLOG_FMT_EXTERNAL
++#define SPDLOG_FMT_EXTERNAL
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+-- 
+2.28.0
+
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb
index 7d28fff5e3..34937c83c8 100644
--- a/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb
+++ b/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb
@@ -4,7 +4,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f"
-SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;"
+SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \
+           file://0001-Enable-use-of-external-fmt-library.patch"
 
 DEPENDS += "fmt"
 
@@ -12,7 +13,7 @@ S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
 # no need to build example&text&benchmarks on pure yocto
-EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on"
+EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on"
 
 inherit cmake
 
-- 
2.17.1


  parent reply	other threads:[~2021-01-17 17:37 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-17 17:36 [gatesgarth 00/31] Patch Review akuster
2021-01-17 17:36 ` [gatesgarth 01/31] mcpp: Normalize the patch format of CVE akuster
2021-01-17 17:36 ` [gatesgarth 02/31] zabbix: CVE-2020-15803 Security Advisory akuster
2021-01-17 17:36 ` [gatesgarth 03/31] samba: CVE-2020-14318 " akuster
2021-01-17 17:36 ` [gatesgarth 04/31] samba: CVE-2020-14383 " akuster
2021-01-17 17:36 ` [gatesgarth 05/31] php: CVE-2020-7070 akuster
2021-01-17 17:36 ` [gatesgarth 06/31] php: CVE-2020-7069 akuster
2021-01-17 17:36 ` [gatesgarth 07/31] nodejs: 12.19.0 -> 12.19.1 akuster
2021-01-17 17:36 ` [gatesgarth 08/31] multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size akuster
2021-01-17 17:36 ` [gatesgarth 09/31] ebtables: do not install /etc/ethertypes akuster
2021-01-17 17:36 ` [gatesgarth 10/31] lockfile-progs: use DEBIAN_MIRROR in SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 11/31] python3-aiohttp: added missing RDEPENDs akuster
2021-01-17 17:36 ` [gatesgarth 12/31] liboop: use upstream SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 13/31] fbset: use DEBIAN_MIRROR in SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 14/31] openct: use upstream SRC_URI akuster
2021-01-17 17:36 ` [gatesgarth 15/31] colord: fix installed-vs-shipped error akuster
2021-01-17 17:36 ` [gatesgarth 16/31] pidgin-sipe: Do not add native libdir to pkgconfig search path akuster
2021-01-17 17:36 ` [gatesgarth 17/31] sdbus-c++-libsystemd: Fix reallocarray check in meson akuster
2021-01-17 17:36 ` [gatesgarth 18/31] networkmanager: Fix reallocarray check in meson and configure akuster
2021-01-17 17:36 ` akuster [this message]
2021-01-17 17:36 ` [gatesgarth 20/31] nanopb: move to dynamic-layers akuster
2021-01-17 17:36 ` [gatesgarth 21/31] postgresql: Use /dev/urandom when openssl is not used akuster
2021-01-17 17:36 ` [gatesgarth 22/31] tclap: align version to tag v1.2.2 akuster
2021-01-17 17:36 ` [gatesgarth 23/31] tclap: fix branch akuster
2021-01-17 17:36 ` [gatesgarth 24/31] lmbench: Fix setting LDLIBS failure akuster
2021-01-17 17:36 ` [gatesgarth 25/31] wireshark: Several securtiy fixes akuster
2021-01-17 17:36 ` [gatesgarth 26/31] nodejs: 12.19.1 -> 12.20.1 akuster
2021-01-17 17:36 ` [gatesgarth 27/31] libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer akuster
2021-01-17 17:36 ` [gatesgarth 28/31] libsdl2-mixer: set --disable-music-ogg-shared to link statically akuster
2021-01-17 17:36 ` [gatesgarth 29/31] gssdp: Upgrade to 1.2.2 -> 1.2.3 akuster
2021-01-17 17:36 ` [gatesgarth 30/31] gupnp: Upgrade to 1.2.2 -> 1.2.4 akuster
2021-01-17 17:36 ` [gatesgarth 31/31] fuse: set CVE_PRODUCT to "fuse_project:fuse" akuster

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=243f73385af8dbdc3fecd49627c56d0df54e36a6.1610904793.git.akuster808@gmail.com \
    --to=akuster808@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /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.