Skip to contentSkip to conversation

librcf: convert CRLF to LF

PATCH New [email protected] 1 participant 1 message Jun 11, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 librcf: convert CRLF to LF

From: Ming Liu <[email protected]>

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.

---
 .../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(-)
meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch +8 -8
index 28cd0fe..e08efb9 100644
@@ -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;
+ 
meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb +2 -2
index 51ad7ec..cf0a8e7 100644
@@ -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"
Signature · 1 line
2.7.4