From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 513D5138359 for ; Fri, 13 Nov 2020 09:32:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F79CE07F1; Fri, 13 Nov 2020 09:32:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A87AE07F1 for ; Fri, 13 Nov 2020 09:32:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F42F341087 for ; Fri, 13 Nov 2020 09:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C3A5386 for ; Fri, 13 Nov 2020 09:32:30 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1605259853.4622c79b0a1bad6dd0c741f3d10fbc987e4f565e.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: configure.ac qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 4622c79b0a1bad6dd0c741f3d10fbc987e4f565e X-VCS-Branch: master Date: Fri, 13 Nov 2020 09:32:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0adb8c06-f8a5-4773-9085-c400db8411ad X-Archives-Hash: b70091b219fac2a08e54f7311c6a8494 commit: 4622c79b0a1bad6dd0c741f3d10fbc987e4f565e Author: Fabian Groffen gentoo org> AuthorDate: Fri Nov 13 09:30:53 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Nov 13 09:30:53 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=4622c79b qmerge: don't call zstd with --long=31 on 32-bits platforms 32-bits recent versions of zstd do not grok this argument, so just drop it for those platforms Bug: https://bugs.gentoo.org/754102 Signed-off-by: Fabian Groffen gentoo.org> configure.ac | 10 ++++++++++ qmerge.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0efdf3e..989a34f 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,16 @@ AM_PROG_AR LT_INIT AC_SUBST([LIBTOOL_DEPS]) +headers='#ifdef HAVE_STDDEF_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif +' +AC_CHECK_HEADERS([stddef.h unistd.h]) +AC_COMPILE_CHECK_SIZEOF([size_t], [${headers}]) + AC_CHECK_FUNCS_ONCE(m4_flatten([ fmemopen scandirat diff --git a/qmerge.c b/qmerge.c index 143c4f3..36d3596 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1191,8 +1191,17 @@ pkg_merge(int level, const depend_atom *atom, const struct pkg_t *pkg) * --long=xx where xx>27. The option is "safe" in the sense * that not more memory is allocated than what is really * needed to decompress the file. See - * https://bugs.gentoo.org/show_bug.cgi?id=634980 */ + * https://bugs.gentoo.org/show_bug.cgi?id=634980, + * however, on 32-bits arches this yields an parameter + * out of bound error: + * https://bugs.gentoo.org/show_bug.cgi?id=710444 + * https://bugs.gentoo.org/show_bug.cgi?id=754102 + * so only do this on 64-bits systems */ +#if SIZEOF_SIZE_T >= 8 compr = "zstd --long=31 -dc"; +#else + compr = "zstd -dc"; +#endif /* If really tar -I would be used we would have to quote: * compr = "I \"zstd --long=31\""; * But actually we use a pipe (see below) */