aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-10-30 13:06:03 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-11-06 17:49:40 +0100
commitb6a62aa38242a2bd0cebbe18219af36da5b0e6dd (patch)
tree4fe9bf3e339f87ccf2a5eb54f118e34202db6fdf /meta-oe
parent51abcdcbdced22cceadba65f5a45f1eb84dd8055 (diff)
downloadmeta-openembedded-contrib-b6a62aa38242a2bd0cebbe18219af36da5b0e6dd.tar.gz
meta-openembedded-contrib-b6a62aa38242a2bd0cebbe18219af36da5b0e6dd.tar.bz2
meta-openembedded-contrib-b6a62aa38242a2bd0cebbe18219af36da5b0e6dd.zip
libubox: fix libdir
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>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch40
-rw-r--r--meta-oe/recipes-devtools/libubox/libubox_git.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch b/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
new file mode 100644
index 0000000000..6f09c8b293
--- /dev/null
+++ b/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
@@ -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
+
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-oe/recipes-devtools/libubox/libubox_git.bb
index 3e886b766d..d0da2c54ff 100644
--- a/meta-oe/recipes-devtools/libubox/libubox_git.bb
+++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb
@@ -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"