git: 6c2554c83e6f - 2022Q2 - archivers/zpaq: fix build on armv6/armv7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Apr 2022 11:00:57 UTC
The branch 2022Q2 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c2554c83e6fe84fce2a725999eab044b8d17774 commit 6c2554c83e6fe84fce2a725999eab044b8d17774 Author: Robert Clausecker <fuz@fuz.su> AuthorDate: 2022-04-18 09:44:54 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2022-04-19 11:00:37 +0000 archivers/zpaq: fix build on armv6/armv7 The ARM EABI has an unsigned char type. Fix the build by using explicitly signed chars in the relevant place. PR: 263389 (cherry picked from commit 6a9ffb1def637dff98c61432f10b610c7aecfedb) --- archivers/paq/files/patch-libzpaq.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/archivers/paq/files/patch-libzpaq.cpp b/archivers/paq/files/patch-libzpaq.cpp new file mode 100644 index 000000000000..a3201867de33 --- /dev/null +++ b/archivers/paq/files/patch-libzpaq.cpp @@ -0,0 +1,20 @@ +--- libzpaq.cpp.orig 2022-04-18 09:32:11 UTC ++++ libzpaq.cpp +@@ -2745,7 +2745,7 @@ void Compressor::writeTag() { + void Compressor::startBlock(int level) { + + // Model 1 - min.cfg +- static const char models[]={ ++ static const signed char models[]={ + 26,0,1,2,0,0,2,3,16,8,19,0,0,96,4,28, + 59,10,59,112,25,10,59,10,59,112,56,0, + +@@ -2774,7 +2774,7 @@ void Compressor::startBlock(int level) { + 0,0}; // 0,0 = end of list + + if (level<1) error("compression level must be at least 1"); +- const char* p=models; ++ const char* p=(const char*)models; + int i; + for (i=1; i<level && toU16(p); ++i) + p+=toU16(p)+2;