From: Sander Vanheule Date: Sun, 31 Jul 2022 13:19:29 +0000 (+0200) Subject: tools: bump 7z package to 22.01 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=101190419969d7e0084976847bc0608919c04594;p=openwrt%2Fstaging%2Fnbd.git tools: bump 7z package to 22.01 Version 22.00 of 7z causes build failures on systems using GCC 12 with the following error: ../../../../C/LzmaEnc.c: In function 'LzmaEnc_CodeOneMemBlock': ../../../../C/LzmaEnc.c:2996:19: error: storing the address of local variable 'outStream' in '*p.rc.outStream' [-Werror=dangling-pointer=] 2996 | p->rc.outStream = &outStream.vt; | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ ../../../../C/LzmaEnc.c:2979:28: note: 'outStream' declared here 2979 | CLzmaEnc_SeqOutStreamBuf outStream; | ^~~~~~~~~ ../../../../C/LzmaEnc.c:2979:28: note: 'pp' declared here Upgrade to version 22.01 which contains the required fix. Fixes: 5fcc6f0f1942 ("tools: add 7z host package") Suggested-by: Tomasz Maciej Nowak Signed-off-by: Sander Vanheule --- diff --git a/tools/7z/Makefile b/tools/7z/Makefile index c94d746c64..90362e7977 100644 --- a/tools/7z/Makefile +++ b/tools/7z/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=7z -PKG_VERSION:=22.00 -PKG_SOURCE_VERSION:=2200 +PKG_VERSION:=22.01 +PKG_SOURCE_VERSION:=2201 PKG_SOURCE:=$(PKG_NAME)$(PKG_SOURCE_VERSION)-src.tar.xz PKG_SOURCE_URL:=https://7-zip.org/a/ -PKG_HASH:=40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675 +PKG_HASH:=393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5 # This builds the 7zr variant which supports only 7z, so no non-LGPL code should be included PKG_LICENSE:=LGPL-2.1-or-later