mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-30 13:56:29 +00:00
liblightmodbus: Fix packaging errors when using multilib
Fixes ERROR: liblightmodbus-2.0.2-r0 do_package: QA Issue: liblightmodbus: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/liblightmodbus.a Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
fa6e382bc6
commit
5239437981
@ -0,0 +1,37 @@
|
|||||||
|
From 066c49158a71ea77598c9e1ae16bba63d6ac6bb5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Thu, 19 Dec 2019 23:41:35 -0800
|
||||||
|
Subject: [PATCH] cmake: Use GNUInstallDirs instead of hardcoding lib path
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://github.com/Jacajack/liblightmodbus/pull/12]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index ce6cc88..bee83aa 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -242,14 +242,14 @@ if ( DEFINED AVR )
|
||||||
|
)
|
||||||
|
endif( )
|
||||||
|
|
||||||
|
-
|
||||||
|
+include(GNUInstallDirs)
|
||||||
|
#Installation
|
||||||
|
install(
|
||||||
|
TARGETS lightmodbus
|
||||||
|
- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/"
|
||||||
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/"
|
||||||
|
)
|
||||||
|
|
||||||
|
#Install headers
|
||||||
|
install(
|
||||||
|
DIRECTORY "${CMAKE_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/" FILES_MATCHING PATTERN "*.h"
|
||||||
|
-)
|
||||||
|
\ No newline at end of file
|
||||||
|
+)
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
||||||
@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
|
|||||||
|
|
||||||
inherit cmake pkgconfig
|
inherit cmake pkgconfig
|
||||||
|
|
||||||
SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https"
|
SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https \
|
||||||
|
file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \
|
||||||
|
"
|
||||||
SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81"
|
SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user