mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 20:07:25 +00:00
fluentbit: Fix packaging in multilib env
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>
This commit is contained in:
@@ -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
|
||||||
@@ -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 \
|
SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \
|
||||||
file://jemalloc.patch \
|
file://jemalloc.patch \
|
||||||
|
file://cmake_multilib.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34"
|
SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34"
|
||||||
SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241"
|
SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241"
|
||||||
|
|||||||
Reference in New Issue
Block a user