From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ANQYBEfaGGRHKAAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 23:12:23 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CJ0aBEfaGGTIcAEA9RJhRA (envelope-from ) for ; Mon, 20 Mar 2023 23:12:23 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 901AB39425 for ; Mon, 20 Mar 2023 23:12:22 +0100 (CET) Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=Z0MEBIh8; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679350342; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=IH5RtzZCm3GNHo4kRX/OhP6+lpX76uO6HknhgFTSqrs=; b=AxrALYHzuGO3+IPeXF5wo8QuqErb9aNWo02lKxuDjCs806nocOXe72kXZNcGadIUGrSjnM T3zs5yZ6jUf9xc2fr4daO6WjV0ZXBPMbsIytfiPAxbzqXvnQrhBCgLuap7j2Cde0c/mHfm duPF6lfHHSUKj3KQfI9rOiWFeSSQQb020H4qLHPgNsXlhrcFBiVVzZgAI61Pn5tnZP6cJI W5V9t6R8QtOT6VM8rW6Rsy5lx+32hg6Om/7VQeKf+P/GPLx4CJb/JMvSZLkYj9zdFo890M fwQzXiqVXhke9IUCQKmZ3PGAPZ/HZVEAEAbR4hlSu+zIPlUuCKtnbALw5XF/Sw== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=Z0MEBIh8; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679350342; a=rsa-sha256; cv=none; b=ke/lf/YsgUHkTWmGm3wCNkyDZpGRCgrZ0ZGoB2kuXo5jCDjRXPTSOiNxde2PdPOl7CKQtp ajFT0giJipfEO6yw5Ky0xtUw19AnrwIDw4CA0wywQIZc1eah87oOLY8fi+aV9SS99DqzvJ eUtsRy5yaMrUfi8Xg/LaZYInkYzPe4HctcjRjRary2MYO8M8nM0zVcHwbNxQLMv9+qsopf D1fGZipv9pilKXlsxUBBFQiFL6xVjTVCT4S1Je8ST0yUJJQ9FOIodt0fgetgO7hbEpPViw JIfDts6JQASXSLz5AYYIaF/W7Cj3gqEv1H4ZCb3LnCN+WRme3awi8QzZXu/Y8Q== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNjg-0003t3-2s; Mon, 20 Mar 2023 18:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNjZ-0003lo-AX for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peNjY-0003Gi-Lc for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNjY-0007NQ-Hk for guix-patches@gnu.org; Mon, 20 Mar 2023 18:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org, Josselin Poiret Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.167935027428181 (code B ref 62307); Mon, 20 Mar 2023 22:12:04 +0000 Received: (at 62307) by debbugs.gnu.org; 20 Mar 2023 22:11:14 +0000 Received: from localhost ([127.0.0.1]:57015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNij-0007K5-0f for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:14 -0400 Received: from jpoiret.xyz ([206.189.101.64]:46960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNic-0007J0-Sa for 62307@debbugs.gnu.org; Mon, 20 Mar 2023 18:11:07 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C2170184D6B; Mon, 20 Mar 2023 22:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679350266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IH5RtzZCm3GNHo4kRX/OhP6+lpX76uO6HknhgFTSqrs=; b=Z0MEBIh85gPJvayuesdaFYrf3WEuWoopOu2h+aHzDf4TuaYUKhncouUefWwxN2f3Q7RW8p tfLapsDPgQJ4gO4iGQue0RqH4S4D0vHWD0fPLggaYVr8jXe4thXXRRQvUvbbzWsB3d9djK iagib4Lo1yex3Up93ZPBVgZOn++sqq/zKTrGQGyQRcWaBtumDR0XsfjHTMbQCDeN92t4vT //N0NAdj/DMHk9NviCOhx38O2fV9gtFJC5r3CFimuRKHLOldKdAt0yPeizAGydioicU05m nOG02sVL+G9wfiouHE7+rCMDYDjkGUEoXGJjO9EQOJDvSLHFwwPEzoX9tSQWMw== Date: Mon, 20 Mar 2023 23:10:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Migadu-Queue-Id: 901AB39425 X-Spam-Score: -4.05 X-Migadu-Spam-Score: -4.05 X-Migadu-Scanner: scn0.migadu.com From: Josselin Poiret via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: ijKfjH9MKpBo * 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: <73fbf2504ae606dda81372701a67dad6fee0865e.1678744619.git.dev@jpoiret.xyz> +From: Josselin Poiret +Date: Sun, 18 Dec 2022 17:38:23 -0500 +Subject: [PATCH] Generate cpu.h with -ffreestanding + +From: Flavio Cruz + +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: +--- + 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