Subject: [PATCH core-updates 07/15] mig: Update to 1.8+git20220827.

From: Josselin Poiret <[email-masked]>
Date: Mon, 20 Mar 2023 23:10:42 +0100

* gnu/packages/hurd.scm (mig): Do it.  Also add patch so that it builds
properly.

* gnu/packages/patches/mig-generate-cpu.h-with-ffreestanding.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/hurd.scm                         | 19 ++++++----
 ...ig-generate-cpu.h-with-ffreestanding.patch | 37 +++++++++++++++++++
 3 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/mig-generate-cpu.h-with-ffreestanding.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d0f89ace6c..43537d1d36 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1544,6 +1544,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mia-vtk9.patch				\
   %D%/packages/patches/mia-vtk92.patch				\
   %D%/packages/patches/mia-vtk-version.patch			\
+  %D%/packages/patches/mig-generate-cpu.h-with-ffreestanding.patch \
   %D%/packages/patches/mingw-w64-6.0.0-gcc.patch		\
   %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch	\
   %D%/packages/patches/mingw-w64-reproducible-gendef.patch	\
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 7f02e6141d..8c33087dc5 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -111,19 +111,22 @@ (define-public gnumach-headers
 (define-public mig
   (package
     (name "mig")
-    (version "1.8")
+    (version "1.8+git20220827")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/mig/mig-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706"))))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.savannah.gnu.org/git/hurd/mig.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "mig" version))
+       (sha256
+        (base32
+         "14fx23056wzc87v5kp01xpfvhvn533xij0naimqriz0vi1z75nxy"))
+       (patches (search-patches "mig-generate-cpu.h-with-ffreestanding.patch"))))
     (build-system gnu-build-system)
     ;; Flex is needed both at build and run time.
     (inputs (list gnumach-headers flex))
-    (native-inputs (list flex bison))
+    (native-inputs (list flex bison autoconf automake))
     (arguments
      (list #:tests? #f
            #:phases
diff --git a/gnu/packages/patches/mig-generate-cpu.h-with-ffreestanding.patch b/gnu/packages/patches/mig-generate-cpu.h-with-ffreestanding.patch
new file mode 100644
index 0000000000..6656d41f13
--- /dev/null
+++ b/gnu/packages/patches/mig-generate-cpu.h-with-ffreestanding.patch
@@ -0,0 +1,37 @@
+From 73fbf2504ae606dda81372701a67dad6fee0865e Mon Sep 17 00:00:00 2001
+Message-Id: <[email-masked]>
+From: Josselin Poiret <[email-masked]>
+Date: Sun, 18 Dec 2022 17:38:23 -0500
+Subject: [PATCH] Generate cpu.h with -ffreestanding
+
+From: Flavio Cruz <[email-masked]>
+
+During a system bootstrap, it is preferable that we don't require a full
+hosted environment. For all other cases, we also do not need libc since
+mach headers are self contained.
+Message-Id: <Y5+WXzOwGkyvcDI0@mars>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 918efa1..35c91bc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@ SUFFIXES = .h .symo .symc .sym
+ .sym.symc:
+ 	$(AWK_V) $(AWK) -f $(srcdir)/gensym.awk $< > $@
+ .symc.symo:
+-	$(AM_V_CC) $(TARGET_CC) -S $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -x c -o $@ $<
++	$(AM_V_CC) $(TARGET_CC) -S $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -ffreestanding -x c -o $@ $<
+ .symo.h:
+ 	$(AM_V_GEN) sed -e '/^[^*].*$$/d' -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' \
+ 	    $< > $@
+
+base-commit: 68b3d8fe3a9595b7a5cb2bb6bc5973ba26139704
+prerequisite-patch-id: 4987b46e52d924507662a60d7dd6fe92a8d28de5
+prerequisite-patch-id: 35c41cc86edb975795b5779d89702245306289d1
+prerequisite-patch-id: ccfb452f7cd419515c13991e03633b0868d46e5e
+-- 
+2.39.1
+
-- 
2.39.2