MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

upx: fix build with gcc-11

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Martin Jansa 2021-05-14 11:51:52 +02:00 committed by Bruce Ashfield
parent 67807f2bc3
commit 670fbe932c
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
recipes-extended/upx/upx/0001-MyCom.h-fix-build-with-gcc-11.patch Normal file
View File

@ -0,0 +1,31 @@
From 8fe8cd22163fe11b791aac15b642d122ea98b9b5 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
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 <martin.jansa@lge.com>
---
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 \

4
recipes-extended/upx/upx_git.bb
View File

@ -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"