mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
gnu: mig: Update to 1.8+git20230520.
This reinstates999a6ac0cf
, which was reverted bya041bbb4bf
, but without resorting to 'git-fetch'. * gnu/packages/hurd.scm (mig): Update to 1.8+git20220827. [source]: Remove patch. * gnu/packages/patches/mig-cpu.h-generation.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
parent
a8c79839d5
commit
4e11cac6be
3 changed files with 3 additions and 21 deletions
|
@ -1594,7 +1594,6 @@ 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 \
|
||||
|
|
|
@ -91,10 +91,10 @@ (define-public gnumach-headers
|
|||
(define-public mig
|
||||
(package
|
||||
(name "mig")
|
||||
(version "1.8+git20220827")
|
||||
(version "1.8+git20230520")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; XXX: Version 2.35 of glibc can only be built with an
|
||||
;; XXX: Versions 2.35 and 2.37 of glibc can only be built with an
|
||||
;; unreleased version of MiG:
|
||||
;; <https://lists.gnu.org/archive/html/bug-hurd/2023-03/msg00025.html>.
|
||||
;; It cannot be fetched from Git though, as the extra dependency
|
||||
|
@ -103,8 +103,7 @@ (define-public mig
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2"))
|
||||
(patches (search-patches "mig-cpu.h-generation.patch"))))
|
||||
"1ap31jd9jkvvz3vb88hg19cyqmqzmra724yl1xhcrv7gcgnan7d9"))))
|
||||
(build-system gnu-build-system)
|
||||
;; Flex is needed both at build and run time.
|
||||
(inputs (list gnumach-headers flex))
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
Backport MiG commit 73fbf2504ae606dda81372701a67dad6fee0865e:
|
||||
|
||||
From: Flavio Cruz <flaviocruz@gmail.com>
|
||||
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]*//' \
|
||||
$< > $@
|
Loading…
Reference in a new issue