[meta-ti] [PATCH] rwmem: Update to 2.0-rc2+
Khem Raj
raj.khem at gmail.com
Thu Sep 26 11:28:29 PDT 2019
On 9/26/19 11:25 AM, Denys Dmytriyenko wrote:
> Does this need:
>
> DEPENDS += "python3"
>
> Otherwise do_configure fails:
>
> -- Checking for module 'python3'
> -- No package 'python3' found
>
it was looking for that on build system so inherit python3native should
have fixed it. Sent a v2 just now
>
> On Thu, Sep 26, 2019 at 09:01:50AM -0700, Khem Raj wrote:
>> - New versions uses CMake and extra modules
>> - Correct detection of nm/ranlib/ar for LTO
>> - Fix build with clang/libc++
>>
>> Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> ---
>> ...Make-provided-vars-for-ar-and-ranlib.patch | 34 +++++++++++++++++++
>> ....h-Include-cerrno-for-errno-definiti.patch | 24 +++++++++++++
>> recipes-bsp/rwmem/rwmem_1.1.bb | 13 -------
>> recipes-bsp/rwmem/rwmem_1.2.bb | 27 +++++++++++++++
>> 4 files changed, 85 insertions(+), 13 deletions(-)
>> create mode 100644 recipes-bsp/rwmem/rwmem/0001-Use-CMake-provided-vars-for-ar-and-ranlib.patch
>> create mode 100644 recipes-bsp/rwmem/rwmem/0001-librwmem-helpers.h-Include-cerrno-for-errno-definiti.patch
>> delete mode 100644 recipes-bsp/rwmem/rwmem_1.1.bb
>> create mode 100644 recipes-bsp/rwmem/rwmem_1.2.bb
>>
>> diff --git a/recipes-bsp/rwmem/rwmem/0001-Use-CMake-provided-vars-for-ar-and-ranlib.patch b/recipes-bsp/rwmem/rwmem/0001-Use-CMake-provided-vars-for-ar-and-ranlib.patch
>> new file mode 100644
>> index 00000000..79968f32
>> --- /dev/null
>> +++ b/recipes-bsp/rwmem/rwmem/0001-Use-CMake-provided-vars-for-ar-and-ranlib.patch
>> @@ -0,0 +1,34 @@
>> +From ee3bbdaae568118b4aad453c8fbb1ec648e8fbf2 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem at gmail.com>
>> +Date: Sat, 8 Dec 2018 22:48:23 -0800
>> +Subject: [PATCH] Use CMake provided vars for ar and ranlib
>> +
>> +hardcoding them means we may not be able to cross compile the package
>> +reliably as build host may or may not have gcc-ar and gcc-ranlib
>> +installed, using the cross tools is the correct thing to do here
>> +
>> +Upstream-Status: Submitted [https://github.com/tomba/rwmem/pull/5]
>> +
>> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> +---
>> + CMakeLists.txt | 4 ++--
>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/CMakeLists.txt b/CMakeLists.txt
>> +index 5e7f327..e36fca0 100644
>> +--- a/CMakeLists.txt
>> ++++ b/CMakeLists.txt
>> +@@ -50,8 +50,8 @@ if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
>> + if (HAS_LTO_FLAG)
>> + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
>> + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
>> +- set(CMAKE_AR gcc-ar)
>> +- set(CMAKE_RANLIB gcc-ranlib)
>> ++ set(CMAKE_AR ${CMAKE_CXX_COMPILER_AR})
>> ++ set(CMAKE_RANLIB ${CMAKE_CXX_COMPILER_RANLIB})
>> + endif()
>> + endif()
>> +
>> +--
>> +2.19.2
>> +
>> diff --git a/recipes-bsp/rwmem/rwmem/0001-librwmem-helpers.h-Include-cerrno-for-errno-definiti.patch b/recipes-bsp/rwmem/rwmem/0001-librwmem-helpers.h-Include-cerrno-for-errno-definiti.patch
>> new file mode 100644
>> index 00000000..9f33fa5e
>> --- /dev/null
>> +++ b/recipes-bsp/rwmem/rwmem/0001-librwmem-helpers.h-Include-cerrno-for-errno-definiti.patch
>> @@ -0,0 +1,24 @@
>> +From 9f1d52590336caeab8038cdd015294df2e5d8c1f Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem at gmail.com>
>> +Date: Fri, 1 Feb 2019 23:47:04 -0800
>> +Subject: [PATCH] librwmem/helpers.h: Include <cerrno> for errno definitions
>> +
>> +this is found with libc++
>> +
>> +Upstream-Status: Submitted [https://github.com/tomba/rwmem/pull/5]
>> +Signed-off-by: Khem Raj <raj.khem at gmail.com>
>> +---
>> + librwmem/helpers.h | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/librwmem/helpers.h b/librwmem/helpers.h
>> +index ccc6c9e..686943e 100644
>> +--- a/librwmem/helpers.h
>> ++++ b/librwmem/helpers.h
>> +@@ -1,5 +1,6 @@
>> + #pragma once
>> +
>> ++#include <cerrno>
>> + #include <string>
>> + #include <vector>
>> + #include <string.h>
>> diff --git a/recipes-bsp/rwmem/rwmem_1.1.bb b/recipes-bsp/rwmem/rwmem_1.1.bb
>> deleted file mode 100644
>> index 2848e1cd..00000000
>> --- a/recipes-bsp/rwmem/rwmem_1.1.bb
>> +++ /dev/null
>> @@ -1,13 +0,0 @@
>> -SUMMARY = "A small tool to read/write memory"
>> -LICENSE = "GPLv2+"
>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>> -
>> -SRCREV = "54904b8873b265d8f1faf82617c2f04814c102c6"
>> -SRC_URI = "git://github.com/tomba/rwmem.git"
>> -
>> -S = "${WORKDIR}/git"
>> -
>> -do_install() {
>> - install -d ${D}${bindir}
>> - install -m 0755 rwmem ${D}${bindir}
>> -}
>> diff --git a/recipes-bsp/rwmem/rwmem_1.2.bb b/recipes-bsp/rwmem/rwmem_1.2.bb
>> new file mode 100644
>> index 00000000..c4d2bc49
>> --- /dev/null
>> +++ b/recipes-bsp/rwmem/rwmem_1.2.bb
>> @@ -0,0 +1,27 @@
>> +SUMMARY = "A small tool to read/write memory"
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>> +
>> +PV .= "+git${SRCPV}"
>> +
>> +SRCREV_rwmem = "7e5ca9802c1b8ff1f6407c19dfd0b9415501bb11"
>> +SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109"
>> +SRCREV_pybind11 = "9a19306fbf30642ca331d0ec88e7da54a96860f9"
>> +
>> +SRCREV_FORMAT = "rwmem_inih_pybind11"
>> +
>> +SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem \
>> + git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \
>> + git://github.com/pybind/pybind11.git;protocol=https;name=pybind11;nobranch=1;destsuffix=git/ext/pybind11 \
>> + file://0001-Use-CMake-provided-vars-for-ar-and-ranlib.patch \
>> + file://0001-librwmem-helpers.h-Include-cerrno-for-errno-definiti.patch \
>> + "
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +inherit cmake pkgconfig python3native
>> +
>> +do_install() {
>> + install -D -m 0755 ${B}/bin/rwmem ${D}${bindir}/rwmem
>> + install -D -m 0644 ${B}/lib/librwmem.a ${D}${libdir}/librwmem.a
>> +}
>> --
>> 2.23.0
>>
>> --
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
More information about the meta-ti
mailing list