From fe1f2bfbe3ca8944df37c6b77f813eaab572a2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 24 Dec 2019 11:48:37 +0000
Subject: [PATCH] bootstrap: annotate with info about desired replacement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a comment against each gnulib module suggesting strategy
for replacement.

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 bootstrap.conf | 159 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 107 insertions(+), 52 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 3d9243fa01..ae9ecb4039 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,58 +17,113 @@
 # <http://www.gnu.org/licenses/>.
 
 # gnulib modules used by this package.
-gnulib_modules='
-accept
-bind
-chown
-close
-connect
-configmake
-environ
-fcntl
-fcntl-h
-getaddrinfo
-getpass
-getpeername
-getsockname
-intprops
-ioctl
-largefile
-listen
-localeconv
-manywarnings
-mgetgroups
-net_if
-netdb
-nonblocking
-openpty
-passfd
-physmem
-pipe-posix
-pipe2
-poll
-posix-shell
-pthread_sigmask
-recv
-send
-setsockopt
-sigaction
-sigpipe
-socket
-stat-time
-strchrnul
-strtok_r
-sys_stat
-sys_wait
-termios
-time_r
-ttyname_r
-uname
-verify
-waitpid
-warnings
-wcwidth
-'
+
+# NB the GSocket conversion is non-trivial due to the
+# different FD vs HANDLE usage in gnulib vs glib. Need
+# to find a way to duplicate a socket HANDLE before
+# turning it into a FD, since closing an FD also closes
+# the original HANDLE.
+
+# -> GSocket
+gnulib_modules="$gnulib_modules accept"
+# -> GSocket
+gnulib_modules="$gnulib_modules bind"
+# -> conditional build to avoid Win32
+gnulib_modules="$gnulib_modules chown"
+# -> GSocket
+gnulib_modules="$gnulib_modules close"
+# -> GSocket
+gnulib_modules="$gnulib_modules connect"
+# -> Meson
+gnulib_modules="$gnulib_modules configmake"
+# -> eliminate usage in some manner
+gnulib_modules="$gnulib_modules environ"
+# -> GSocket
+gnulib_modules="$gnulib_modules fcntl"
+# -> conditional build avoid win32
+gnulib_modules="$gnulib_modules fcntl-h"
+# -> GSocket
+gnulib_modules="$gnulib_modules getaddrinfo"
+# -> copy gnuliub win32 impl
+gnulib_modules="$gnulib_modules getpass"
+# -> GSocket
+gnulib_modules="$gnulib_modules getpeername"
+# -> GSocket
+gnulib_modules="$gnulib_modules getsockname"
+# -> copy gnulib STRBUFLEN macro
+gnulib_modules="$gnulib_modules intprops"
+# -> GSocket
+gnulib_modules="$gnulib_modules ioctl"
+# -> Meson
+gnulib_modules="$gnulib_modules largefile"
+# -> GSocket
+gnulib_modules="$gnulib_modules listen"
+# -> custom configure check
+gnulib_modules="$gnulib_modules localeconv"
+# -> Meson
+gnulib_modules="$gnulib_modules manywarnings"
+# -> 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 nonblocking"
+# -> Just add -lutil to cli
+gnulib_modules="$gnulib_modules openpty"
+# -> GSocket
+gnulib_modules="$gnulib_modules passfd"
+# -> open code / copy gnulib code
+gnulib_modules="$gnulib_modules physmem"
+# -> 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 pthread_sigmask"
+# -> GSocket
+gnulib_modules="$gnulib_modules recv"
+# -> GSocket
+gnulib_modules="$gnulib_modules send"
+# -> GSocket
+gnulib_modules="$gnulib_modules setsockopt"
+# -> open code conditional logic
+gnulib_modules="$gnulib_modules sigaction"
+# -> open code conditional logic
+gnulib_modules="$gnulib_modules sigpipe"
+# -> GSocket
+gnulib_modules="$gnulib_modules socket"
+# -> open code conditional or use GIO GFileInfo
+gnulib_modules="$gnulib_modules stat-time"
+# -> 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"
+# -> remove from any win32 code paths
+gnulib_modules="$gnulib_modules termios"
+# -> GDateTime ?
+gnulib_modules="$gnulib_modules time_r"
+# -> obsolete - exists on Linux, MacOS >= ?? & FreeBSD >= 6
+gnulib_modules="$gnulib_modules ttyname_r"
+# -> g_get_os_info in GLib 2.64 but can't use that yet
+gnulib_modules="$gnulib_modules uname"
+# -> G_STATIC_ASSERT
+gnulib_modules="$gnulib_modules verify"
+# -> remove from Win32 code paths
+gnulib_modules="$gnulib_modules waitpid"
+# -> Meson
+gnulib_modules="$gnulib_modules warnings"
+# -> open code impl
+gnulib_modules="$gnulib_modules wcwidth"
 
 SKIP_PO=true