All of lore.kernel.org
 help / color / mirror / Atom feed
From: Armin Kuster <akuster808@gmail.com>
To: openembedded-devel@openembedded.org
Subject: [zeus 11/11] fluentbit: Fix packaging in multilib env
Date: Sun,  9 Feb 2020 08:17:19 -0800	[thread overview]
Message-ID: <bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c.1581264950.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1581264950.git.akuster808@gmail.com>

From: Khem Raj <raj.khem@gmail.com>

Fixes
ERROR: fluentbit-0.12.19-r0 do_package: QA Issue: fluentbit: Files/directories were installed but not shipped in any package:
/usr/lib/libfluent-bit.so
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 99fe1dec83456100e0bc1c02581defa7aaf04a16)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../fluentbit/fluentbit/cmake_multilib.patch   | 18 ++++++++++++++++++
 .../fluentbit/fluentbit_0.12.19.bb             |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch

diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch
new file mode 100644
index 0000000000..8fe9f3e703
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch
@@ -0,0 +1,18 @@
+Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib path
+
+Helps build on platforms where libpaths are not lib/ but say lib64/
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -182,7 +182,7 @@ if(NOT FLB_WITHOUT_SHARED_LIB)
+     PROPERTIES OUTPUT_NAME fluent-bit)
+ 
+   # Library install routines
+-  install(TARGETS fluent-bit-shared LIBRARY DESTINATION lib)
++  install(TARGETS fluent-bit-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ # Static Library
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb
index e50aa71a9f..27b910b8be 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb
@@ -4,6 +4,7 @@ BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
 
 SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \
            file://jemalloc.patch \
+           file://cmake_multilib.patch \
            "
 SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34"
 SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241"
-- 
2.17.1



      parent reply	other threads:[~2020-02-09 16:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-09 16:17 [zeus 00/11] Patch review Armin Kuster
2020-02-09 16:17 ` [zeus 01/11] libldb: upgrade 1.5.5 -> 1.5.6 Armin Kuster
2020-02-10 20:00   ` Khem Raj
2020-02-09 16:17 ` [zeus 02/11] mariadb: fix library LZ4 lookup Armin Kuster
2020-02-09 16:17 ` [zeus 03/11] python-twisted: add required RDEPENDS for twistd Armin Kuster
2020-02-09 16:17 ` [zeus 04/11] pyhamcrest: add python3 version of recipe Armin Kuster
2020-02-09 16:17 ` [zeus 05/11] gitpkgv.bbclass: Add support for extending the supported tag formats Armin Kuster
2020-02-09 16:17 ` [zeus 06/11] squid: Link with libatomic on riscv Armin Kuster
2020-02-09 16:17 ` [zeus 07/11] grpc: Link with libatomic on clang/x86 Armin Kuster
2020-02-09 16:17 ` [zeus 08/11] grpc: Link with libatomic on powerpc Armin Kuster
2020-02-09 16:17 ` [zeus 09/11] grpc: Link with libatomic on riscv Armin Kuster
2020-02-09 16:17 ` [zeus 10/11] netdata: Add libatomic to link step Armin Kuster
2020-02-09 16:17 ` Armin Kuster [this message]

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=bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c.1581264950.git.akuster808@gmail.com \
    --to=akuster808@gmail.com \
    --cc=openembedded-devel@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.