CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libubox: fix libdir

Browse Source 
The library dir maybe /usr/lib64 or /usr/lib, so use the variable
CMAKE_INSTALL_LIBDIR, not hardcode to lib

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Roy Li 2015-10-30 13:06:03 +08:00 committed by Martin Jansa
parent 51abcdcbdc
commit b6a62aa382
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch Normal file
View File

@ -0,0 +1,40 @@
[PATCH] fix the CMAKE_INSTALL_LIBDIR
Upstream-Status: Pending
libdir maybe /usr/lib64 for 64bit machine
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57804cf..2c7bdc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,8 @@ INSTALL(FILES ${headers}
DESTINATION include/libubox
)
INSTALL(TARGETS ubox ubox-static
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
ADD_SUBDIRECTORY(lua)
@@ -58,8 +58,8 @@ IF(EXISTS ${json})
TARGET_LINK_LIBRARIES(json_script ubox)
INSTALL(TARGETS blobmsg_json blobmsg_json-static jshn json_script
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION bin
)
--
1.9.1

1
meta-oe/recipes-devtools/libubox/libubox_git.bb
View File

@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "\
SRC_URI = "\
git://git.openwrt.org/project/libubox.git \
file://0001-version-libraries.patch \
file://fix-libdir.patch \
"
SRCREV = "136a5196266d03d537f822c4e67d2fde2ed59505"