From 21f7ec05e8f5f8952877e24c4b8a55822131459c Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Sun, 11 Jun 2017 14:58:15 +0200 Subject: librcf: convert CRLF to LF librcf is developed on Windows system, so CRLF is the line terminator being used in this project, this can lead annoying patching issues if the users forget to set autocrlf in git config. It can be fixed by inheriting dos2unix, hence a convert_crlf_to_lf task will be executed before do_patch, to convert all CRLF to LF. Signed-off-by: Ming Liu Signed-off-by: Martin Jansa --- .../recipes-devtools/librcf/librcf/aarch64-support.patch | 16 ++++++++-------- meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta-oe/recipes-devtools/librcf') diff --git a/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch b/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch index 28cd0fe60b..e08efb92f7 100644 --- a/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch +++ b/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch @@ -3,11 +3,11 @@ Index: RCF-2.2.0.0/src/RCF/ByteOrdering.cpp --- RCF-2.2.0.0.orig/src/RCF/ByteOrdering.cpp +++ RCF-2.2.0.0/src/RCF/ByteOrdering.cpp @@ -60,7 +60,7 @@ namespace RCF { - - const ByteOrder MachineByteOrder = LittleEndian; - --#elif defined(__arm__) -+#elif defined(__arm__) || defined(__aarch64__) - - const ByteOrder MachineByteOrder = LittleEndian; - + + const ByteOrder MachineByteOrder = LittleEndian; + +-#elif defined(__arm__) ++#elif defined(__arm__) || defined(__aarch64__) + + const ByteOrder MachineByteOrder = LittleEndian; + diff --git a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb index 51ad7ec9cd..cf0a8e7b1c 100644 --- a/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +++ b/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.deltavsoft.com/" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://license.txt;md5=137c2935b51c95068a8b1bbd434ffe2d" +LIC_FILES_CHKSUM = "file://license.txt;md5=7586a312b9e978f9d6fac9a5780d1f84" SRC_URI = "http://www.deltavsoft.com/downloads/RCF-${PV}.tar.gz \ file://0001-Add-CMake-build-files.patch \ @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "bbfcc88de502c39604878c395f516b03fff4eac63eb4f7f44c07d43383 S = "${WORKDIR}/RCF-${PV}" -inherit cmake +inherit cmake dos2unix PACKAGECONFIG ?= "zlib openssl sf-serialization boost-filesystem boost-asio protobuf json dll static shared demos" PACKAGECONFIG[zlib] = "-DLIBRCF_USE_ZLIB=ON,-DLIBRCF_USE_ZLIB=OFF,zlib,zlib" -- cgit 1.2.3-korg