From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UCLKCUv6ImSXJwAASxT56A (envelope-from ) for ; Tue, 28 Mar 2023 16:31:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iFh6CUv6ImSMZgAAauVa8A (envelope-from ) for ; Tue, 28 Mar 2023 16:31:39 +0200 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 aspmx1.migadu.com (Postfix) with ESMTPS id D3F0238CA for ; Tue, 28 Mar 2023 16:31:38 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=JyFHlTFW; spf=pass (aspmx1.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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680013898; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=GRQT1sAWutF/cG48GcWxUCTVxA5W/5kuaasViYcwlMc=; b=nWv7c2/9uw4ZgvOeShk86Jvd6QnTImZr5fUxvaMOc+bex29LrHLrK5wDWIukpwc/r7OWzE TRAsOFApNPGroEZNcj9j3DsSAtMtaO/G94AeiMNDt1kC50oTEvv3+jxT1dAsDCd6EASGv/ wDeb3OW6zvpd4IQ2B1EGOym8UMkhlLA2d9wopqrVK5IF+BFBJkZXt3Yw5dERAQ+Xpx+Dxr UFy8Zrw5UxCZCMA4y9Kvw4NaGMCAmgYZtodykxkKTv6rqtwGy324l4pqUuhIZsF/Jc6c7z 1jfqQsi+/3/2wXGa6uR0nrtuenvrvS3iPvwgiRbMGGg65WCXep1YivpikmbjqQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680013898; a=rsa-sha256; cv=none; b=jQte0DVlFUA6A/nihXCsqeYoAgbKEXH5EYBz2GvsQh9/xrw2dYtukpNIcJ3iSfsG1FTIz3 2fxaSWGwba6jjHXCRLLo3Le55V0mTVqvBz33A7Dp8O9jkOJBAIxPl/z77tvznnMNrQcSiF pdfIt2bcp0OJhpR1Imiaaap+r2F8BANiK6tpnEpT1OUV0FPVzjL7axrfFWlGJ+QsOx1gOr ZMFKWFZp9Fm4mqz78Ptw7+OCMdqs19aIsF0DVfsALoVvm+DvQRxnjF6/z/1g1uJXdzdE4C Cp8Z8WSEn9sx3l0cYH9Xiu17pMiqo5BR1LNp0swGyrGIukKTtvkl2VmQjuFzgA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=JyFHlTFW; spf=pass (aspmx1.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"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phAKu-0004fZ-S9; Tue, 28 Mar 2023 10:30:08 -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 1phAKt-0004eU-Pa for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:07 -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 1phAKt-0006rL-HB for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phAKt-0002b5-Ck for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates v2 07/20] gnu: mig: Update to 1.8+git20220827. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Mar 2023 14:30:07 +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 Cc: Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.16800137829781 (code B ref 62307); Tue, 28 Mar 2023 14:30:07 +0000 Received: (at 62307) by debbugs.gnu.org; 28 Mar 2023 14:29:42 +0000 Received: from localhost ([127.0.0.1]:50416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKT-0002Xb-CY for submit@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKA-0002UV-H9 for 62307@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phAK5-0006Pi-AL; Tue, 28 Mar 2023 10:29:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=GRQT1sAWutF/cG48GcWxUCTVxA5W/5kuaasViYcwlMc=; b=JyFHlTFWJqj1AiZ5XY2A hKxCCjssINZtDw8tANDXKSOJflaSHXASNdVUmni4y2dzUyaAeHWXmN7p4JAqE9DFok/husBPKdLaQ q5qxF2feyHm0ifwqcUJ838jliW0OaFEkvC6zLoEeXIZH7ZPRfi9V28MMFzajT6n06omxARGXpAr91 KUcslXE6DAG4P/QqOcwgtDR1IUqKnMOQayG8JB939wtcTYttEh7CxmSP7KEOabGN55+vp2bKCP4Wy vwodlSjPLofh9jUtQzg09dSp022BrAAwwwpQBR29+S6J8imXcmU+oQm7VX8K0KbUo6fCyAXL99k3j mmc8Lp0tJkoVOg==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAK4-00026Y-Sz; Tue, 28 Mar 2023 10:29:17 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 28 Mar 2023 16:28:39 +0200 Message-Id: <20230328142852.26635-8-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230328142852.26635-1-ludo@gnu.org> References: <87pm90bzva.fsf_-_@gnu.org> <20230328142852.26635-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: X-Migadu-Queue-Id: D3F0238CA X-Spam-Score: -2.53 X-Migadu-Spam-Score: -2.53 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , 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: 6T0gkTrrHb7t From: Josselin Poiret * gnu/packages/hurd.scm (mig): Do it. * gnu/packages/patches/mig-cpu.h-generation.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 26 ++++++++++++------- .../patches/mig-cpu.h-generation.patch | 16 ++++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/mig-cpu.h-generation.patch diff --git a/gnu/local.mk b/gnu/local.mk index c44ad3aab3..10a55164e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1542,6 +1542,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-cpu.h-generation.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..078d495c87 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -111,15 +111,23 @@ (define-public gnumach-headers (define-public mig (package (name "mig") - (version "1.8") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mig/mig-" - version ".tar.gz")) - (sha256 - (base32 - "1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706")))) + (version "1.8+git20220827") + (source (origin + (method url-fetch) + ;; FIXME: Use permanent URL at ftp.gnu.org. + + ;; XXX: Version 2.35 of glibc can only be built with an + ;; unreleased version of MiG: + ;; . + ;; It cannot be fetched from Git though, as the extra dependency + ;; on Autoconf/Automake would complicate bootstrapping. + (uri (string-append + "https://people.bordeaux.inria.fr/lcourtes/tmp/mig-" + version ".tar.gz")) + (sha256 + (base32 + "163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2")) + (patches (search-patches "mig-cpu.h-generation.patch")))) (build-system gnu-build-system) ;; Flex is needed both at build and run time. (inputs (list gnumach-headers flex)) diff --git a/gnu/packages/patches/mig-cpu.h-generation.patch b/gnu/packages/patches/mig-cpu.h-generation.patch new file mode 100644 index 0000000000..3030eaeaa6 --- /dev/null +++ b/gnu/packages/patches/mig-cpu.h-generation.patch @@ -0,0 +1,16 @@ +Backport MiG commit 73fbf2504ae606dda81372701a67dad6fee0865e: + + From: Flavio Cruz + Subject: Generate cpu.h with -ffreestanding + +--- a/Makefile.in 2023-03-26 23:02:51.384318331 +0200 ++++ b/Makefile.in 2023-03-26 23:03:03.300329369 +0200 +@@ -1051,7 +1051,7 @@ uninstall-am: uninstall-binSCRIPTS unins + .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]*//' \ + $< > $@ -- 2.39.2