diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-12-19 16:02:04 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-12-20 16:07:50 -0800 |
| commit | 61d823300e3e4662df1d3b0dffbfc34f3d558a60 (patch) | |
| tree | 087989c79341d2349a8ce27c1a19d9c382c9608c /meta-networking/recipes-connectivity | |
| parent | b27741f2a4d611c1b0c2eca88a8d19b7b779c5a1 (diff) | |
| download | meta-openembedded-61d823300e3e4662df1d3b0dffbfc34f3d558a60.tar.gz | |
cannelloni: Update to latest and fix multilib builds
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
2 files changed, 47 insertions, 2 deletions
diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch b/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch new file mode 100644 index 0000000000..b78f0b3291 --- /dev/null +++ b/meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch @@ -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 + diff --git a/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb b/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb index df75e6342e..cd893afb37 100644 --- a/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb +++ b/meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb @@ -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}" |