From 3d63a187baf79c9984d0355a909c9a337366224a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Wed, 22 Jan 2020 16:04:35 +0000
Subject: [PATCH] bootstrap: remove 18 more gnulib modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 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.
 
-# -> conditional build to avoid Win32
-gnulib_modules="$gnulib_modules chown"
-# -> Meson
-gnulib_modules="$gnulib_modules configmake"
-# -> GSocket
-gnulib_modules="$gnulib_modules getaddrinfo"
-# -> copy gnuliub win32 impl
-gnulib_modules="$gnulib_modules getpass"
 # -> Meson
 gnulib_modules="$gnulib_modules largefile"
 # -> custom configure check
 gnulib_modules="$gnulib_modules localeconv"
-# -> painful copy gnulib
-gnulib_modules="$gnulib_modules mgetgroups"
-# -> GSocket
-gnulib_modules="$gnulib_modules net_if"
-# -> GSocket
-gnulib_modules="$gnulib_modules netdb"
-# -> GSocket
-gnulib_modules="$gnulib_modules passfd"
 # -> open code / conditional comp
 gnulib_modules="$gnulib_modules pipe-posix"
 # -> open code / conditional comp
 gnulib_modules="$gnulib_modules pipe2"
 # -> GMainLoop
 gnulib_modules="$gnulib_modules poll"
-# -> Meson
-gnulib_modules="$gnulib_modules posix-shell"
-# -> open code conditional logic
-gnulib_modules="$gnulib_modules sigaction"
-# -> open code conditional logic
-gnulib_modules="$gnulib_modules sigpipe"
-# -> open code conditional or use GIO GFileInfo
-gnulib_modules="$gnulib_modules stat-time"
 # -> GThread
 gnulib_modules="$gnulib_modules threadlib"
-# -> remove use or open-code it. possibly add to glib
-gnulib_modules="$gnulib_modules strchrnul"
-# -> g_strsplit
-gnulib_modules="$gnulib_modules strtok_r"
-# -> remove sys/stat.h include from any win32 code paths
-gnulib_modules="$gnulib_modules sys_stat"
 # -> remove sys/wait.h include from any win32 code paths
 gnulib_modules="$gnulib_modules sys_wait"
-# -> g_get_os_info in GLib 2.64 but can't use that yet
-gnulib_modules="$gnulib_modules uname"
-# -> remove from Win32 code paths
-gnulib_modules="$gnulib_modules waitpid"
-# -> open code impl
-gnulib_modules="$gnulib_modules wcwidth"
 
 SKIP_PO=true
 
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;
 }
 
+/* Temp hack - we're still pulling in gnulib
+ * fcntl-h indirectly, but not fcntl */
+#ifdef WIN32
+# undef F_DUPFD_CLOEXEC
+#endif
 
 int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec)
 {