mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-18 07:23:59 +00:00
upx: bump to v4.2.2 (#11878)
This commit is contained in:
parent
0d84afc31a
commit
24e2cfc64f
package/lean/upx
@ -7,13 +7,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=upx
|
||||
PKG_VERSION:=3.96
|
||||
PKG_VERSION:=4.2.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/upx/upx.git
|
||||
PKG_SOURCE_VERSION:=d7ba31cab8ce8d95d2c10e88d2ec787ac52005ef
|
||||
PKG_MIRROR_HASH:=15b4884dbe35d3b7bda27538429cab92aaeaca006d558deb49f2ef93e3c261b8
|
||||
PKG_SOURCE_VERSION:=099c3d829e80488af7395a4242b318877e980da4
|
||||
PKG_MIRROR_HASH:=8bee3cd1ada2e4bfbe396348d2aecb3e044f92cdae2b7010838e36997fe6b3c3
|
||||
|
||||
PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
@ -46,7 +46,7 @@ define Host/Compile
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(CP) $(HOST_BUILD_DIR)/src/upx.out $(STAGING_DIR_HOST)/bin/upx
|
||||
$(CP) $(HOST_BUILD_DIR)/build/release/upx $(STAGING_DIR_HOST)/bin/upx
|
||||
endef
|
||||
|
||||
define Host/Clean
|
||||
@ -55,7 +55,7 @@ endef
|
||||
|
||||
define Package/upx/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/upx.out $(1)/usr/bin/upx
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/release/upx $(1)/usr/bin/upx
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
|
@ -1,28 +0,0 @@
|
||||
From 4121815fb9bc977ab0953558a2a69fa33550c53c 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) \
|
||||
| ^~
|
||||
|
||||
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
|
||||
---
|
||||
src/lzma-sdk/C/Common/MyCom.h | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
--- a/src/lzma-sdk/C/Common/MyCom.h
|
||||
+++ b/src/lzma-sdk/C/Common/MyCom.h
|
||||
@@ -156,8 +156,7 @@ class CMyUnknownImp
|
||||
|
||||
#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 \
|
Loading…
Reference in New Issue
Block a user