this fails on arm https://errors.yoctoproject.org/Errors/Details/745647/
On Sun, Dec 3, 2023 at 11:54 PM Alper Ak <[email protected]> wrote: > > * 0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch removed because > fixed in the new version > > Changelog: > > * Performance improvements > * Compilation fixes for various environments > > Signed-off-by: alperak <[email protected]> > --- > ...-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch | 71 ------------------- > .../{snappy_1.1.9.bb => snappy_1.1.10.bb} | 8 +-- > 2 files changed, 3 insertions(+), 76 deletions(-) > delete mode 100644 > meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch > rename meta-oe/recipes-extended/snappy/{snappy_1.1.9.bb => snappy_1.1.10.bb} > (85%) > > diff --git > a/meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch > > b/meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch > deleted file mode 100644 > index 27357d88a..000000000 > --- > a/meta-oe/recipes-extended/snappy/snappy/0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch > +++ /dev/null > @@ -1,71 +0,0 @@ > -From 4728803cc8687431449c8c9fbfabb1da04943400 Mon Sep 17 00:00:00 2001 > -From: "Georgi D. Sotirov" <[email protected]> > -Date: Wed, 5 May 2021 14:16:46 +0300 > -Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE > - > -Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to > -fix the following compilation errors and a warning with GCC: > - > -[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o > -/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS > --I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3 > --march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3 > --DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c > -/tmp/snappy-1.1.9/snappy.cc > -/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline > -function might not be inlinable [-Wattributes] > - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { > - ^ > -/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair<const > -unsigned char*, int> snappy::DecompressBranchless(const uint8_t*, const > -uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned > -char; ptrdiff_t = int]': > -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in > -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, > -size_t*)': function body can be overwritten at link time > -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here > - size_t tag_type = AdvanceToNextTag(&ip, &tag); > - ^ > -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in > -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, > -size_t*)': function body can be overwritten at link time > - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { > - ^ > -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here > - size_t tag_type = AdvanceToNextTag(&ip, &tag); > - ^ > -/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in > -call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**, > -size_t*)': function body can be overwritten at link time > - size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { > - ^ > -/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here > - size_t tag_type = AdvanceToNextTag(&ip, &tag); > - ^ > -CMakeFiles/snappy.dir/build.make:137: recipe for target > -'CMakeFiles/snappy.dir/snappy.cc.o' failed > - > -Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE > -macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++ > -inline specifier. > - > -Signed-off-by: Martin Jansa <[email protected]> > - > -Upstream-Status: Submitted [https://github.com/google/snappy/pull/128] > ---- > - snappy.cc | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/snappy.cc b/snappy.cc > -index 79dc0e8..51157be 100644 > ---- a/snappy.cc > -+++ b/snappy.cc > -@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t > size) { > - } > - > - SNAPPY_ATTRIBUTE_ALWAYS_INLINE > --size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { > -+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { > - const uint8_t*& ip = *ip_p; > - // This section is crucial for the throughput of the decompression loop. > - // The latency of an iteration is fundamentally constrained by the > diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb > b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb > similarity index 85% > rename from meta-oe/recipes-extended/snappy/snappy_1.1.9.bb > rename to meta-oe/recipes-extended/snappy/snappy_1.1.10.bb > index 9e0e43ce8..7baf9c647 100644 > --- a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb > +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb > @@ -10,12 +10,10 @@ compression ratio." > LICENSE = "BSD-3-Clause" > LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" > > -SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \ > - file://0001-Add-inline-with-SNAPPY_ATTRIBUTE_ALWAYS_INLINE.patch \ > -" > -SRCREV = "2b63814b15a2aaae54b7943f0cd935892fae628f" > -S = "${WORKDIR}/git" > +SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main" > +SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83" > > +S = "${WORKDIR}/git" > > inherit cmake pkgconfig > > -- > 2.25.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107229): https://lists.openembedded.org/g/openembedded-devel/message/107229 Mute This Topic: https://lists.openembedded.org/mt/102966758/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
