mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-09 05:49:23 +00:00
Code Issues Projects Releases Wiki Activity

cannelloni: Update to latest and fix multilib builds

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-19 16:02:04 -08:00
parent b27741f2a4
commit 61d823300e
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch
+43
View File
@@ -0,0 +1,43 @@
From c74f04dbab4d586287347b1d5517f36e2f0c3d8e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 19 Dec 2019 15:52:34 -0800
Subject: [PATCH] Use GNUInstallDirs instead of hard-coding paths
Bump minimum cmake version to be >= 3.1
Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/22]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
CMakeLists.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51b354f..958e0eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1)
project(cannelloni)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -60,6 +60,8 @@ set_target_properties ( cannelloni-common
SOVERSION 0
)
+include(GNUInstallDirs)
+
if(SCTP_SUPPORT)
add_library(sctpthread STATIC sctpthread.cpp)
target_link_libraries(sctpthread addsources sctp)
@@ -68,5 +70,5 @@ endif(SCTP_SUPPORT)
set_target_properties(addsources PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(cannelloni addsources cannelloni-common pthread)
-install(TARGETS cannelloni DESTINATION bin)
-install(TARGETS cannelloni-common DESTINATION lib)
+install(TARGETS cannelloni DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS cannelloni-common DESTINATION ${CMAKE_INSTALL_LIBDIR})
--
2.24.1
meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb
+4 -2
View File
@@ -2,8 +2,10 @@ SUMMARY = "a SocketCAN over Ethernet tunnel"
HOMEPAGE = "https://github.com/mguentner/cannelloni"
LICENSE = "GPLv2"
SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https"
SRCREV = "44080bb021d1a143e6906f2ec4610513c4e1cece"
SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https \
file://0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch \
"
SRCREV = "82aa49b417b96fe46bb3f017ae1bfea928f20f9a"
PV = "20160414+${SRCPV}"