Signed-off-by: Khem Raj <[email protected]> --- ...tallDirs-module-to-detect-install-pa.patch | 48 +++++++++++++++++++ recipes-devtools/ion/libion_git.bb | 4 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch
diff --git a/recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch b/recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch new file mode 100644 index 00000000..bf63ed32 --- /dev/null +++ b/recipes-devtools/ion/libion/0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch @@ -0,0 +1,48 @@ +From 51eece2c291e121f9ae67c9b812617b885e76a64 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 18 Dec 2019 20:31:52 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs module to detect install paths + +This helps it to calculate directories as per platform instead of +hardcoding them, helps compile it for arches which use /lib64 and +/usr/lib64 for libpaths + +Upstream-Status: Submitted [https://github.com/glneo/libion/pull/2] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e5928c..5b7c0de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ PROJECT(ion) + set(PROJECT_DESCRIPTION "ION Userspace Memory Allocator Library") + set(PROJECT_VERSION 1.0.0) + ++INCLUDE(GNUInstallDirs) ++ + add_library(ion + SHARED + src/libion.c +@@ -23,12 +25,12 @@ target_include_directories(ion + configure_file(libion.pc.in libion.pc @ONLY) + + install(TARGETS ion +- LIBRARY DESTINATION lib +- PUBLIC_HEADER DESTINATION include/ion) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ion) + + install(DIRECTORY include/kernel-headers/4.19/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") + + install(FILES ${CMAKE_BINARY_DIR}/libion.pc +- DESTINATION lib/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +-- +2.24.1 + diff --git a/recipes-devtools/ion/libion_git.bb b/recipes-devtools/ion/libion_git.bb index 8bfe19eb..4cf03afa 100644 --- a/recipes-devtools/ion/libion_git.bb +++ b/recipes-devtools/ion/libion_git.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" PV = "1.0.0" BRANCH = "master" -SRC_URI = "git://github.com/glneo/libion.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://github.com/glneo/libion.git;protocol=git;branch=${BRANCH} \ + file://0001-cmake-Use-GNUInstallDirs-module-to-detect-install-pa.patch \ + " SRCREV = "813bd63e2f2118e17cb1c5d38505a1e572a2381c" S = "${WORKDIR}/git" -- 2.24.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12584): https://lists.yoctoproject.org/g/meta-ti/message/12584 Mute This Topic: https://lists.yoctoproject.org/mt/68824383/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
