mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-14 10:55:23 -05:00
2d546858b1
Version 2.28 of glibc is the first in a long time that fully supports GNU/Hurd. This change updates the Hurd and Mach to provide the features glibc 2.28 expects and adjusts the cross-compilation tool chain for "i586-pc-gnu". * gnu/packages/base.scm (glibc/linux): Rename to... (glibc): ... this. [propagated-inputs]: Add 'hurd-target?' case. [arguments]: Use '--disable-werror' when 'hurd-target?'. Add 'augment-libc.so' phase when 'hurd-target?'. [native-inputs]: Add MIG and PERL when 'hurd-target?'. (glibc/hurd, glibc-for-target): Remove (glibc/hurd-headers): Inherit from GLIBC, not GLIBC/HURD. [arguments]: Remove "--enable-obsolete-rpc" configure flag and 'patch-configure-script' phase. * gnu/packages/cross-base.scm (cross-kernel-headers)[xglibc/hurd-headers]: Move 'set-cross-headers-path' after 'unpack'. * gnu/packages/cross-base.scm (cross-libc)[cross-libc-for-target]: Remove. Pass "--disable-werror" when TARGET matches 'hurd-triplet?'. * gnu/packages/hurd.scm (hurd-target?, patch-url): New procedures. (gnumach-headers)[source](patches, modules, snippet): New fields. (hurd-headers): Use Git commit 98b3390. [native-inputs]: Add AUTOCONF and AUTOMAKE. [arguments]: Add "ac_cv_func_*" configure flags. (hurd-minimal)[native-inputs]: Remove. [arguments]: In 'build' phase, build "include/assert-backtrace.h" first.
335 lines
13 KiB
Scheme
335 lines
13 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
|
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (gnu packages hurd)
|
|
#:use-module (guix licenses)
|
|
#:use-module (guix download)
|
|
#:use-module (guix packages)
|
|
#:use-module (gnu packages)
|
|
#:use-module (guix utils)
|
|
#:use-module (guix build-system gnu)
|
|
#:use-module (guix build-system trivial)
|
|
#:use-module (gnu packages autotools)
|
|
#:use-module (gnu packages flex)
|
|
#:use-module (gnu packages bison)
|
|
#:use-module (gnu packages perl)
|
|
#:use-module (gnu packages base)
|
|
#:use-module (guix git-download)
|
|
#:export (hurd-triplet?
|
|
hurd-target?))
|
|
|
|
(define (hurd-triplet? triplet)
|
|
(and (string-suffix? "-gnu" triplet)
|
|
(not (string-contains triplet "linux"))))
|
|
|
|
(define (hurd-target?)
|
|
"Return true if the cross-compilation target or the current system is
|
|
GNU/Hurd."
|
|
(or (and=> (%current-target-system) hurd-triplet?)
|
|
(string-suffix? (%current-system) "-gnu")))
|
|
|
|
(define (gnumach-source-url version)
|
|
(string-append "mirror://gnu/gnumach/gnumach-"
|
|
version ".tar.gz"))
|
|
|
|
(define (hurd-source-url version)
|
|
(string-append "mirror://gnu/hurd/hurd-"
|
|
version ".tar.gz"))
|
|
|
|
(define (patch-url repository commit)
|
|
(string-append "https://git.savannah.gnu.org/cgit/hurd/" repository
|
|
".git/patch/?id=" commit))
|
|
|
|
(define-public gnumach-headers
|
|
(package
|
|
(name "gnumach-headers")
|
|
(version "1.8")
|
|
(source
|
|
(origin
|
|
(method url-fetch)
|
|
(uri (gnumach-source-url version))
|
|
(sha256
|
|
(base32
|
|
"02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))
|
|
(patches (list (origin
|
|
;; This patch adds <mach/vm_wire.h>, which defines the
|
|
;; VM_WIRE_* constants needed by glibc 2.28.
|
|
(method url-fetch)
|
|
(uri (patch-url "gnumach" "2b0f19f602e08fd9d37268233b962674fd592634"))
|
|
(sha256
|
|
(base32
|
|
"01iajnwsmka0w9hwjkxxijc4xfhwqbvlkw1w8n71hpnhfixd0y28"))
|
|
(file-name "gnumach-vm-wire-header.patch"))))
|
|
(modules '((guix build utils)))
|
|
(snippet
|
|
'(begin
|
|
;; Actually install vm_wire.h.
|
|
(substitute* "Makefile.in"
|
|
(("^include_mach_HEADERS =")
|
|
"include_mach_HEADERS = include/mach/vm_wire.h"))
|
|
#t))))
|
|
(build-system gnu-build-system)
|
|
(arguments
|
|
`(#:phases
|
|
(modify-phases %standard-phases
|
|
(replace 'install
|
|
(lambda _
|
|
(invoke "make" "install-data")))
|
|
(delete 'build))
|
|
|
|
;; GNU Mach supports only IA32 currently, so cheat so that we can at
|
|
;; least install its headers.
|
|
,@(if (%current-target-system)
|
|
'()
|
|
;; See <http://lists.gnu.org/archive/html/bug-hurd/2015-06/msg00042.html>
|
|
;; <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00716.html>
|
|
'(#:configure-flags '("--build=i586-pc-gnu")))
|
|
|
|
#:tests? #f))
|
|
(home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
|
|
(synopsis "GNU Mach kernel headers")
|
|
(description
|
|
"Headers of the GNU Mach kernel.")
|
|
(license gpl2+)))
|
|
|
|
(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"))))
|
|
(build-system gnu-build-system)
|
|
;; Flex is needed both at build and run time.
|
|
(inputs `(("gnumach-headers" ,gnumach-headers)
|
|
("flex" ,flex)))
|
|
(native-inputs
|
|
`(("flex" ,flex)
|
|
("bison" ,bison)))
|
|
(arguments `(#:tests? #f))
|
|
(home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html")
|
|
(synopsis "Mach 3.0 interface generator for the Hurd")
|
|
(description
|
|
"GNU MIG is the GNU distribution of the Mach 3.0 interface generator
|
|
MIG, as maintained by the GNU Hurd developers for the GNU project.
|
|
You need this tool to compile the GNU Mach and GNU Hurd distributions,
|
|
and to compile the GNU C library for the Hurd. Also, you will need it
|
|
for other software in the GNU system that uses Mach-based inter-process
|
|
communication.")
|
|
(license gpl2+)))
|
|
|
|
(define-public hurd-headers
|
|
;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and
|
|
;; 'file_exec_paths' RPCs that glibc 2.28 expects.
|
|
(let ((revision "0")
|
|
(commit "98b33905c89b7e5c309c74ae32302a5745901a6e"))
|
|
(package
|
|
(name "hurd-headers")
|
|
(version "0.9")
|
|
(source (origin
|
|
(method git-fetch)
|
|
(uri (git-reference
|
|
(url "https://git.savannah.gnu.org/git/hurd/hurd.git")
|
|
(commit commit)))
|
|
(sha256
|
|
(base32
|
|
"1mj22sxgscas2675vrbxr477mwbxdj68pqcrh65lbir8qlssrgrf"))
|
|
(file-name (git-file-name name version))))
|
|
(build-system gnu-build-system)
|
|
(native-inputs
|
|
`(("mig" ,mig)
|
|
("autoconf" ,autoconf)
|
|
("automake" ,automake)))
|
|
(arguments
|
|
`(#:phases
|
|
(modify-phases %standard-phases
|
|
(replace 'install
|
|
(lambda _
|
|
(invoke "make" "install-headers" "no_deps=t")))
|
|
(delete 'build))
|
|
|
|
#:configure-flags '( ;; Pretend we're on GNU/Hurd; 'configure' wants
|
|
;; that.
|
|
,@(if (%current-target-system)
|
|
'()
|
|
'("--host=i586-pc-gnu"))
|
|
|
|
;; Reduce set of dependencies.
|
|
"--without-parted"
|
|
"--disable-ncursesw"
|
|
"--disable-test"
|
|
"--without-libbz2"
|
|
"--without-libz"
|
|
;; Skip the clnt_create check because it expects
|
|
;; a working glibc causing a circular dependency.
|
|
"ac_cv_search_clnt_create=no"
|
|
|
|
;; Annihilate the checks for the 'file_exec_paths'
|
|
;; & co. libc functions to avoid "link tests are
|
|
;; not allowed after AC_NO_EXECUTABLES" error.
|
|
"ac_cv_func_file_exec_paths=no"
|
|
"ac_cv_func_exec_exec_paths=no"
|
|
"ac_cv_func__hurd_exec_paths=no"
|
|
"ac_cv_func_file_futimens=no")
|
|
|
|
#:tests? #f))
|
|
(home-page "https://www.gnu.org/software/hurd/hurd.html")
|
|
(synopsis "GNU Hurd headers")
|
|
(description
|
|
"This package provides C headers of the GNU Hurd, used to build the GNU C
|
|
Library and other user programs.")
|
|
(license gpl2+))))
|
|
|
|
(define-public hurd-minimal
|
|
(package (inherit hurd-headers)
|
|
(name "hurd-minimal")
|
|
(inputs `(("glibc-hurd-headers" ,glibc/hurd-headers)))
|
|
(arguments
|
|
(substitute-keyword-arguments (package-arguments hurd-headers)
|
|
((#:phases _)
|
|
'(modify-phases %standard-phases
|
|
(replace 'install
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
(let ((out (assoc-ref outputs "out")))
|
|
;; We need to copy libihash.a to the output directory manually,
|
|
;; since there is no target for that in the makefile.
|
|
(mkdir-p (string-append out "/include"))
|
|
(copy-file "libihash/ihash.h"
|
|
(string-append out "/include/ihash.h"))
|
|
(mkdir-p (string-append out "/lib"))
|
|
(copy-file "libihash/libihash.a"
|
|
(string-append out "/lib/libihash.a"))
|
|
#t)))
|
|
(replace 'build
|
|
(lambda _
|
|
;; Install <assert-backtrace.h> & co.
|
|
(invoke "make" "-Clibshouldbeinlibc"
|
|
"../include/assert-backtrace.h")
|
|
|
|
;; Build libihash.
|
|
(invoke "make" "-Clibihash" "libihash.a")))))))
|
|
(home-page "https://www.gnu.org/software/hurd/hurd.html")
|
|
(synopsis "GNU Hurd libraries")
|
|
(description
|
|
"This package provides libihash, needed to build the GNU C
|
|
Library for GNU/Hurd.")
|
|
(license gpl2+)))
|
|
|
|
(define-public hurd-core-headers
|
|
(package
|
|
(name "hurd-core-headers")
|
|
(version (package-version hurd-headers))
|
|
(source #f)
|
|
(build-system trivial-build-system)
|
|
(arguments
|
|
'(#:modules ((guix build union))
|
|
#:builder (begin
|
|
(use-modules (ice-9 match)
|
|
(guix build union))
|
|
(match %build-inputs
|
|
(((names . directories) ...)
|
|
(union-build (assoc-ref %outputs "out")
|
|
directories)
|
|
#t)))))
|
|
(inputs `(("gnumach-headers" ,gnumach-headers)
|
|
("hurd-headers" ,hurd-headers)
|
|
("hurd-minimal" ,hurd-minimal)))
|
|
(synopsis "Union of the Hurd headers and libraries")
|
|
(description
|
|
"This package contains the union of the Mach and Hurd headers and the
|
|
Hurd-minimal package which are needed for both glibc and GCC.")
|
|
(home-page (package-home-page hurd-headers))
|
|
(license (package-license hurd-headers))))
|
|
|
|
(define-public gnumach
|
|
(package
|
|
(name "gnumach")
|
|
(version "1.8")
|
|
(source (origin
|
|
(method url-fetch)
|
|
(uri (gnumach-source-url version))
|
|
(sha256
|
|
(base32
|
|
"02hygsfpd2dljl5lg1vjjg9pizi9jyxd4aiiqzjshz6jax62jm9f"))))
|
|
(build-system gnu-build-system)
|
|
(arguments
|
|
`(#:phases (modify-phases %standard-phases
|
|
(add-after 'install 'produce-image
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
(boot (string-append out "/boot")))
|
|
(invoke "make" "gnumach.gz")
|
|
(install-file "gnumach.gz" boot)
|
|
#t))))))
|
|
(native-inputs
|
|
`(("mig" ,mig)
|
|
("perl" ,perl)))
|
|
(supported-systems (cons "i686-linux" %hurd-systems))
|
|
(home-page
|
|
"https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html")
|
|
(synopsis "Microkernel of the GNU system")
|
|
(description
|
|
"GNU Mach is the microkernel upon which a GNU Hurd system is based.")
|
|
(license gpl2+)))
|
|
|
|
(define-public hurd
|
|
(package
|
|
(name "hurd")
|
|
(version "0.9")
|
|
(source (origin
|
|
(method url-fetch)
|
|
(uri (hurd-source-url version))
|
|
(sha256
|
|
(base32
|
|
"1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw"))
|
|
(patches (search-patches "hurd-fix-eth-multiplexer-dependency.patch"))))
|
|
(arguments
|
|
`(#:phases
|
|
(modify-phases %standard-phases
|
|
(add-before 'build 'pre-build
|
|
(lambda _
|
|
;; Don't change the ownership of any file at this time.
|
|
(substitute* '("daemons/Makefile" "utils/Makefile")
|
|
(("-o root -m 4755") ""))
|
|
#t)))
|
|
#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
|
%output "/lib")
|
|
"--disable-ncursesw"
|
|
"--without-libbz2"
|
|
"--without-libz"
|
|
"--without-parted")))
|
|
(build-system gnu-build-system)
|
|
(inputs `(("glibc-hurd-headers" ,glibc/hurd-headers)))
|
|
(native-inputs
|
|
`(("mig" ,mig)
|
|
("perl" ,perl)))
|
|
(supported-systems %hurd-systems)
|
|
(home-page "https://www.gnu.org/software/hurd/hurd.html")
|
|
(synopsis "The kernel servers for the GNU operating system")
|
|
(description
|
|
"The Hurd is the kernel for the GNU system, a replacement and
|
|
augmentation of standard Unix kernels. It is a collection of protocols for
|
|
system interaction (file systems, networks, authentication), and servers
|
|
implementing them.")
|
|
(license gpl2+)))
|