From nobody Sat May 4 18:29:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1514931846209560.2632508415389; Tue, 2 Jan 2018 14:24:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C595C0587CB; Tue, 2 Jan 2018 22:24:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F0245D964; Tue, 2 Jan 2018 22:24:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8734A4BB79; Tue, 2 Jan 2018 22:24:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w02MO0qG023500 for ; Tue, 2 Jan 2018 17:24:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3F7195EDE5; Tue, 2 Jan 2018 22:24:00 +0000 (UTC) Received: from red.redhat.com (ovpn-125-17.rdu2.redhat.com [10.10.125.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 934A95D75C; Tue, 2 Jan 2018 22:23:57 +0000 (UTC) From: Eric Blake To: libvir-list@redhat.com Date: Tue, 2 Jan 2018 16:23:55 -0600 Message-Id: <20180102222355.15598-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com Subject: [libvirt] [PATCH v2] maint: Update to latest gnulib X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 02 Jan 2018 22:24:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Michal Privoznik Unfortunately, since gnulib's commit of 2c5d558745 there's an unused parameter to stat_time_normalize() function which gnulib developers don't want to fix yet [1]. Therefore, we have to work around it by temporarily providing a downstream patch. 1: http://lists.gnu.org/archive/html/bug-gnulib/2018-01/msg00000.html Signed-off-by: Michal Privoznik [eblake: use gnulib local diff, instead of #pragma] Signed-off-by: Eric Blake --- v2: perhaps nicer than Michal's original suggestion, but I'd still wait another day or two to see if my arguments on the upstream gnulib thread can instead give us a better submodule commit to update to that avoids the problem altogether. --- .gnulib | 2 +- bootstrap | 4 ++-- gnulib/local/lib/stat-time.h.diff | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 gnulib/local/lib/stat-time.h.diff diff --git a/.gnulib b/.gnulib index 5e9abf8716..c2cb55b34e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 5e9abf87163ad4aeaefef0b02961f8674b0a4879 +Subproject commit c2cb55b34e76546479f195c14202dfcc870c4914 diff --git a/bootstrap b/bootstrap index 85b85c530f..25920e991c 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=3D2017-09-19.08; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -792,7 +792,7 @@ symlink_to_dir() # aren't confused into doing unnecessary builds. Conversely, if the # existing symlink's timestamp is older than the source, make it afr= esh, # so that broken tools aren't confused into skipping needed builds. = See - # . + # . test -h "$dst" && src_ls=3D$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=3D$1 = && dst_ls=3D$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=3D$1 = && diff --git a/gnulib/local/lib/stat-time.h.diff b/gnulib/local/lib/stat-time= .h.diff new file mode 100644 index 0000000000..8333520d2d --- /dev/null +++ b/gnulib/local/lib/stat-time.h.diff @@ -0,0 +1,13 @@ +diff --git i/lib/stat-time.h w/lib/stat-time.h +index 5f8bf4e12..68871f567 100644 +--- i/lib/stat-time.h ++++ w/lib/stat-time.h +@@ -212,7 +212,7 @@ get_stat_birthtime (struct stat const *st) + errno to EOVERFLOW if normalization overflowed. This function + is intended to be private to this .h file. */ + _GL_STAT_TIME_INLINE int +-stat_time_normalize (int result, struct stat *st) ++stat_time_normalize (int result, struct stat *st _GL_UNUSED) + { + #if defined __sun && defined STAT_TIMESPEC + if (result =3D=3D 0) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list