hurd: Make build-many-glibcs.py use mainline gnumach

Some warnings need a couple of fixes in the gnumach headers.

        * scripts/build-many-glibcs.py (checkout_vcs): Add gnumach
        repository URLs, run autoreconf, and make it the default for now.

diff --git a/ChangeLog b/ChangeLog
index 5eebc64..863afe0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,8 +19,8 @@
        timer_ptr2id to cast struct timer_node * to void *.
        * scripts/build-many-glibcs.py [os == gnu] (build_gcc): Pass
        --disable-libcilkrts to gcc configure.
-       (checkout_vcs): Add mig repository URL, and run autoreconf, make it the
-       default for now.
+       (checkout_vcs): Add mig and gnumach repository URLs, run autoreconf,
+       and make them the default for now.
        * sysdeps/mach/hurd/Makefile [$(subdir)==nis]: Add
        -DUSE_BINDINGDIR=1 to CFLAGS-ypclnt.c.
        * mach/Machrules (MIGFLAGS): Do not set -DMACH_IPC_COMPAT=0.

diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index d7adcc8..43b573e 100755 (executable)
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -705,7 +705,7 @@ class Context(object):
                             'mpc': '1.1.0',
                             'mpfr': '4.0.0',
                             'mig': 'vcs-mainline',
-                            'gnumach': '1.8',
+                            'gnumach': 'vcs-mainline',
                             'hurd': 'vcs-mainline'}
         use_versions = {}
         explicit_versions = {}
@@ -786,6 +786,13 @@ class Context(object):
             r = self.git_checkout(component, git_url, git_branch, update)
             self.fix_glibc_timestamps()
             return r
+        elif component == 'gnumach':
+            git_url = 'git://git.savannah.gnu.org/hurd/gnumach.git'
+            git_branch = 'master'
+            r = self.git_checkout(component, git_url, git_branch, update)
+            subprocess.run(['autoreconf', '-i'],
+                           cwd=self.component_srcdir(component), check=True)
+            return r
         elif component == 'mig':
             git_url = 'git://git.savannah.gnu.org/hurd/mig.git'
             git_branch = 'master'