Signed-off-by: Martin Jansa <[email protected]> --- .../0001-MyCom.h-fix-build-with-gcc-11.patch | 31 +++++++++++++++++++ recipes-extended/upx/upx_git.bb | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch
diff --git a/recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch b/recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch new file mode 100644 index 0000000..8b07c77 --- /dev/null +++ b/recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch @@ -0,0 +1,31 @@ +From 8fe8cd22163fe11b791aac15b642d122ea98b9b5 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Fri, 14 May 2021 02:26:13 -0700 +Subject: [PATCH] MyCom.h: fix build with gcc-11 + +* fixes: + ./../src/lzma-sdk/C/7zip/Compress/LZMA/LZMAEncoder.h: In member function 'virtual ULONG NCompress::NLZMA::CEncoder::Release()': + ./../src/lzma-sdk/C/7zip/Compress/LZMA/../../../Common/MyCom.h:159:32: error: this 'if' clause does not guard... [-Werror=misleading-indentation] + 159 | STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) \ + | ^~ + +Upstream-Status: Submitted [https://github.com/upx/upx-lzma-sdk/pull/5] +Signed-off-by: Martin Jansa <[email protected]> +--- + C/Common/MyCom.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/C/Common/MyCom.h b/C/Common/MyCom.h +index b8dbf38..2e3c54a 100644 +--- a/C/Common/MyCom.h ++++ b/C/Common/MyCom.h +@@ -156,8 +156,7 @@ public: + + #define MY_ADDREF_RELEASE \ + STDMETHOD_(ULONG, AddRef)() { return ++__m_RefCount; } \ +-STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) \ +- return __m_RefCount; delete this; return 0; } ++STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0) return __m_RefCount; delete this; return 0; } + + #define MY_UNKNOWN_IMP_SPEC(i) \ + MY_QUERYINTERFACE_BEGIN \ diff --git a/recipes-extended/upx/upx_git.bb b/recipes-extended/upx/upx_git.bb index b77e658..96d2e99 100644 --- a/recipes-extended/upx/upx_git.bb +++ b/recipes-extended/upx/upx_git.bb @@ -2,7 +2,9 @@ HOMEPAGE = "http://upx.sourceforge.net"; SUMMARY = "Ultimate executable compressor." SRCREV = "4e1ae22a1a07be5135c68b25ff05058ae8ae48e1" -SRC_URI = "gitsm://github.com/upx/upx;branch=devel" +SRC_URI = "gitsm://github.com/upx/upx;branch=devel \ + file://0001-MyCom.h-fix-build-with-gcc-11.patch;patchdir=src/lzma-sdk \ +" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=353753597aa110e0ded3508408c6374a" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6513): https://lists.yoctoproject.org/g/meta-virtualization/message/6513 Mute This Topic: https://lists.yoctoproject.org/mt/82820498/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
