From nobody Sat Feb 7 08:23:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1580217257914551.1107145726555; Tue, 28 Jan 2020 05:14:17 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-265-PED9cT41Pi-qaK6FaYvR7A-1; Tue, 28 Jan 2020 08:13:56 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E6778010CB; Tue, 28 Jan 2020 13:13:49 +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 15EAB60BE0; Tue, 28 Jan 2020 13:13:49 +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 BCF5085E42; Tue, 28 Jan 2020 13:13:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SDDms2019496 for ; Tue, 28 Jan 2020 08:13:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 02BED1084194; Tue, 28 Jan 2020 13:13:48 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (unknown [10.33.8.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B945100EBA4; Tue, 28 Jan 2020 13:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580217256; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GqseBjeywNSkYuFrwxECVWad+M25q0lJIcjXM8T4RKU=; b=fyJJjUpjzjGPoMjkl8w/8m5fnv3ad3B1osrEtkHqd1UufO426KGRp25SWhuUd2KY4a5Tj+ 2ZTbcC54hV41GkYSg3jr4SEccTwmE0YBo84dn+NtmWJRYBNyU0QCgSwRY57+wEu0oz/EuN TenrsFHPHGo3Ei4vdAay6y6F+Dp0c/Y= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH v2 32/56] bootstrap: remove 18 more gnulib modules Date: Tue, 28 Jan 2020 13:11:13 +0000 Message-Id: <20200128131137.1762449-33-berrange@redhat.com> In-Reply-To: <20200128131137.1762449-1-berrange@redhat.com> References: <20200128131137.1762449-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: PED9cT41Pi-qaK6FaYvR7A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" * chown: use is conditionally compiled * configmake: functionality imported to Makefile.am * getaddrinfo: we have no portability problems with Windows impl * getpass: simplified impl is imported * mgetgroups: getgrouplist is used directly * net_if: header includes are conditionalized * netdb: header includes are conditionalized * passfd: simplified impl is imported * posix-shell: functionality was unused & removed * sigaction: usage is conditionalized * sigpipe: usage is conditionalized * stat-time: struct stat is used directly * strchrnul: usage is eliminated * strtok_r: usage is not a portability problem * sys_stat: usage is conditionalized * uname: rewritten to use native Win32 function to get host arch * waitpid: usage is conditionalized * wcwidth: rewritten using g_unichar APIs Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pavel Hrdina --- bootstrap.conf | 36 ------------------------------------ po/POTFILES.in | 1 - src/rpc/virnetsocket.c | 5 +++++ 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 4159199d08..7e1412093f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -24,56 +24,20 @@ # turning it into a FD, since closing an FD also closes # the original HANDLE. =20 -# -> conditional build to avoid Win32 -gnulib_modules=3D"$gnulib_modules chown" -# -> Meson -gnulib_modules=3D"$gnulib_modules configmake" -# -> GSocket -gnulib_modules=3D"$gnulib_modules getaddrinfo" -# -> copy gnuliub win32 impl -gnulib_modules=3D"$gnulib_modules getpass" # -> Meson gnulib_modules=3D"$gnulib_modules largefile" # -> custom configure check gnulib_modules=3D"$gnulib_modules localeconv" -# -> painful copy gnulib -gnulib_modules=3D"$gnulib_modules mgetgroups" -# -> GSocket -gnulib_modules=3D"$gnulib_modules net_if" -# -> GSocket -gnulib_modules=3D"$gnulib_modules netdb" -# -> GSocket -gnulib_modules=3D"$gnulib_modules passfd" # -> open code / conditional comp gnulib_modules=3D"$gnulib_modules pipe-posix" # -> open code / conditional comp gnulib_modules=3D"$gnulib_modules pipe2" # -> GMainLoop gnulib_modules=3D"$gnulib_modules poll" -# -> Meson -gnulib_modules=3D"$gnulib_modules posix-shell" -# -> open code conditional logic -gnulib_modules=3D"$gnulib_modules sigaction" -# -> open code conditional logic -gnulib_modules=3D"$gnulib_modules sigpipe" -# -> open code conditional or use GIO GFileInfo -gnulib_modules=3D"$gnulib_modules stat-time" # -> GThread gnulib_modules=3D"$gnulib_modules threadlib" -# -> remove use or open-code it. possibly add to glib -gnulib_modules=3D"$gnulib_modules strchrnul" -# -> g_strsplit -gnulib_modules=3D"$gnulib_modules strtok_r" -# -> remove sys/stat.h include from any win32 code paths -gnulib_modules=3D"$gnulib_modules sys_stat" # -> remove sys/wait.h include from any win32 code paths gnulib_modules=3D"$gnulib_modules sys_wait" -# -> g_get_os_info in GLib 2.64 but can't use that yet -gnulib_modules=3D"$gnulib_modules uname" -# -> remove from Win32 code paths -gnulib_modules=3D"$gnulib_modules waitpid" -# -> open code impl -gnulib_modules=3D"$gnulib_modules wcwidth" =20 SKIP_PO=3Dtrue =20 diff --git a/po/POTFILES.in b/po/POTFILES.in index e266871907..c18e21615f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,7 +5,6 @@ @BUILDDIR@/src/admin/admin_server_dispatch_stubs.h @BUILDDIR@/src/remote/remote_client_bodies.h @BUILDDIR@/src/remote/remote_daemon_dispatch_stubs.h -@SRCDIR@/gnulib/lib/gai_strerror.c @SRCDIR@/src/access/viraccessdriverpolkit.c @SRCDIR@/src/access/viraccessmanager.c @SRCDIR@/src/admin/admin_server.c diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index be9ac9aeed..e1af68450f 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1388,6 +1388,11 @@ int virNetSocketGetFD(virNetSocketPtr sock) return fd; } =20 +/* Temp hack - we're still pulling in gnulib + * fcntl-h indirectly, but not fcntl */ +#ifdef WIN32 +# undef F_DUPFD_CLOEXEC +#endif =20 int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec) { --=20 2.24.1