From patchwork Wed Jun 2 10:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 29795 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 02C4B27BC81; Wed, 2 Jun 2021 11:02:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 850A027BC78 for ; Wed, 2 Jun 2021 11:02:13 +0100 (BST) Received: from localhost ([::1]:42060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loNhU-0004f9-HE for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 06:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loNhK-0004eP-D8 for guix-patches@gnu.org; Wed, 02 Jun 2021 06:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loNhK-0007sA-5D for guix-patches@gnu.org; Wed, 02 Jun 2021 06:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loNhK-0007rc-1x for guix-patches@gnu.org; Wed, 02 Jun 2021 06:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48788] [PATCH] gnu: libaio: Fix build with newer GCC versions. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Jun 2021 10:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48788 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48788@debbugs.gnu.org Cc: Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162262809530189 (code B ref -1); Wed, 02 Jun 2021 10:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jun 2021 10:01:35 +0000 Received: from localhost ([127.0.0.1]:38946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loNgo-0007qn-O3 for submit@debbugs.gnu.org; Wed, 02 Jun 2021 06:01:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:57620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loNgj-0007qZ-4N for submit@debbugs.gnu.org; Wed, 02 Jun 2021 06:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loNgi-0004Ug-TA for guix-patches@gnu.org; Wed, 02 Jun 2021 06:01:24 -0400 Received: from mout.web.de ([212.227.17.11]:42169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loNgd-0007Oq-CC for guix-patches@gnu.org; Wed, 02 Jun 2021 06:01:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1622628076; bh=v7mfDzuKMF/hbSdar3XeO4lnyryx3Q//8YXvitPMD0o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=UxXvMNa4tFhHopziGXBTvZqRG9qkw36M9k7rYXcw2EIxfmQqcQhSn0rPRPITTnL8M sIRanY0KcUNCosHOv2QQXH/lEfsIOgi4jJJBF8XlGngNAPyp07SXsYJoBMb/p2AbZ6 7FnmeF+m7xKUHcWTEE/ktMAlexR4oYeqUll6Ex70= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from 3700X.fritz.box ([88.152.185.61]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MTy1N-1lws703PbV-00Qfv4; Wed, 02 Jun 2021 12:01:15 +0200 From: Jonathan Brielmaier Date: Wed, 2 Jun 2021 12:01:07 +0200 Message-Id: <20210602100107.28577-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:YLcExHuN+vHYVVeFiBLjrmMyeRsVT9/8lHCfr15QNRIaPf1E6MU d2yMsf3RNvsmmWuXmEvjGdE1P3izdad0MqANxkMF9BMx+dPYiV6sTl5VSIcNOL2Rtw4jess Oc9N+Ak27AydMPRCQmSU+9CVC5bzZx7sZbIbRJSKZ832zbikDKp0+LKhYDv5RL4/qjmj2cM WClm38NYkDK4SAo8IsLVg== X-UI-Out-Filterresults: notjunk:1;V03:K0:eeyeuC8UDDQ=:3QmgKFcKy8JSOZcPDQhhMa dXPgBizZ2GbFbwRfulGkdMDfDt4/H8O9fh98Qm9ZxMVJcTIXk84X+pPNmiJ18Zeip9PpWoSSX DomL3mGw5O+H0RO9lHYZGGiXssP+C89ydvhE/oW/LsDQ17ai7CKdCjfVcuOwC2+PU5HNypw0m z0OHQT46qmV7kcZ+DWKiFuhLbK0IEeqSW+mMQ6QdcKKUPE11PDUZQx/QrNgzHD0NHdpnx7Y3n c7hbXZtBzpcKkU00t66nF/bAwQHpYp6J5Imm7hcr2225umefKZlYF69PfYHhQClUIvvTejsgh ev+BbP1uiCbPL8o4rRbIIzNNSVWLtaknfKKDHpreSU2of1+F3VdvIGOWlmLErdnnIsEOLevv7 CTIAzQtbXZW+NSfAZpy0/ZAbAh1/XbUYCtNBBlgz+ddzRyHCkbXqfv+UAt+suuX/2dkhl25iL hTsayt5DwvczTad5tnory15zVXsFo5uz0tMRs3+pMP4vWwxJ74VFI/LOQfjsMaQ/hhHcVMadV qShEJmH5uwXfzCAlet0oCL+Su9UDHKJaTWFLaF7v6ACen5W/d2RznjmTeyL1iSRvIxpYJ0eMf BbcoMT+U9OqRJzUju4xZ6Rd8Zpt9BGl+xL/m6pEbFQiAe91fSIyaOJHt3BypbwGcHrrMbrfaI 1mFFhr/Bp+oi9yvxgAnls1VFwpbl+eO0RcqvHLBF9wkDGiTrxp6h+OgoGBTJyxiv98xWLPbS5 4bEjvJsn0QVfZE9Zrh/94IlyLKHhh4Hk7Y2wWsmwf37S67HDldFLGap7jLVOKvZAUR+FwOEj2 FbY+jsC+Rzq20EkAqg1UzragjdUOvMk+ZdSf2OZVmzRHcjwsE15LD0x3uhj2Opol5ZqYl/KIA GLb5V42kJqTJnHTZlQnUENqno0XAtJ50FnvkPPxe2W1cn2m29pXx/IXQ8qupGo9ltI/zO9YRs KObIRYBMigCPCU8PypjiCR/ytzSZE7mRaB8kccpW0TLMI9FJ3DNtaBjHTOkpXWGbookugZYp/ z+le7Ox0jsqnbKFiM3xXeFOtGo/Pqiv1Dwqxz0CRjt7AcG9PHdBAoVACDk3NhGGyulBCCfsQL QbaxXThjAEttmI3sN92jOPwsWEPKKo4+6XB08OlDF1/OAGky4/g+6AUUA== Received-SPF: pass client-ip=212.227.17.11; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/libaio-fix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/linux.scm (libaio): Use the patch. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 1 + gnu/packages/patches/libaio-fix-build.patch | 46 +++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 gnu/packages/patches/libaio-fix-build.patch -- 2.31.1 diff --git a/gnu/local.mk b/gnu/local.mk index d5a832146e..1e8dab8989 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1251,6 +1251,7 @@ dist_patch_DATA = \ %D%/packages/patches/jfsutils-include-systypes.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ + %D%/packages/patches/libaio-fix-build.patch \ %D%/packages/patches/libblockdev-glib-compat.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cf020a153b..427335c8d5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4861,6 +4861,7 @@ Linux Device Mapper multipathing driver: (uri (list (string-append "https://releases.pagure.org/libaio/" name "-" version ".tar.gz"))) + (patches (search-patches "libaio-fix-build.patch")) (sha256 (base32 "14mlqdapjqq1dhpkdgy5z83mvsaz36fcxca7a4z6hinmr7r6415b")))) diff --git a/gnu/packages/patches/libaio-fix-build.patch b/gnu/packages/patches/libaio-fix-build.patch new file mode 100644 index 0000000000..68b69a5fb2 --- /dev/null +++ b/gnu/packages/patches/libaio-fix-build.patch @@ -0,0 +1,46 @@ +From b9e17f6afdc4d0e81b1598aecea7b80d0c54b13a Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Jul 29 2019 16:26:10 +0000 +Subject: harness: Use destination strncpy() expression for sizeof() argument + + +Even though this is the same size, as the sizeof() is derived from the +source expression, recent gcc versions will emit a warning, which is +turned into an error by -Werror: + + error: argument to ‘sizeof’ in ‘strncpy’ call is the same expression + as the source; did you mean to use the size of the destination? + [-Werror=sizeof-pointer-memaccess] + +Signed-off-by: Guillem Jover +Signed-off-by: Jeff Moyer + +--- + +diff --git a/harness/cases/19.t b/harness/cases/19.t +index 4989510..5c3e0d6 100644 +--- a/harness/cases/19.t ++++ b/harness/cases/19.t +@@ -41,7 +41,7 @@ open_temp_file(void) + int fd; + char template[sizeof(TEMPLATE)]; + +- strncpy(template, TEMPLATE, sizeof(TEMPLATE)); ++ strncpy(template, TEMPLATE, sizeof(template)); + fd = mkostemp(template, O_DIRECT); + if (fd < 0) { + perror("mkstemp"); +diff --git a/harness/cases/21.t b/harness/cases/21.t +index 441eaa8..fe33a9d 100644 +--- a/harness/cases/21.t ++++ b/harness/cases/21.t +@@ -43,7 +43,7 @@ open_temp_file() + int fd; + char temp_file[sizeof(TEMPLATE)]; + +- strncpy(temp_file, TEMPLATE, sizeof(TEMPLATE)); ++ strncpy(temp_file, TEMPLATE, sizeof(temp_file)); + fd = mkstemp(temp_file); + if (fd < 0) { + perror("mkstemp"); +