From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:53860) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNEtg-0006Ap-So for guix-patches@gnu.org; Sat, 11 Apr 2020 08:06:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNEtf-0002Zl-Lf for guix-patches@gnu.org; Sat, 11 Apr 2020 08:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44658) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNEtf-0002ZX-Ip for guix-patches@gnu.org; Sat, 11 Apr 2020 08:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNEte-0003Q8-Cf for guix-patches@gnu.org; Sat, 11 Apr 2020 08:06:02 -0400 Subject: [bug#40552] [PATCH] gnu: hurd: Build DDE libraries. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:53526) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNEtQ-0005tp-5j for guix-patches@gnu.org; Sat, 11 Apr 2020 08:05:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNEtO-0002Si-L8 for guix-patches@gnu.org; Sat, 11 Apr 2020 08:05:48 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21396) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNEtO-0002RQ-86 for guix-patches@gnu.org; Sat, 11 Apr 2020 08:05:46 -0400 From: Ricardo Wurmus Message-ID: <20200411120532.1660-1-rekado@elephly.net> Date: Sat, 11 Apr 2020 14:05:32 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40552@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/hurd.scm (hurd)[native-inputs]: Add "dde-sources". [inputs]: Add libpciaccess. [arguments]: Add phase "prepare-dde". --- gnu/packages/hurd.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 5a56714d24..64911bfb1f 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2020 Efraim Flashner ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright =C2=A9 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages texinfo) + #:use-module (gnu packages xorg) ; libpciaccess #:use-module (guix git-download) #:export (hurd-system? hurd-target? @@ -363,6 +365,19 @@ boot, since this cannot be done from GNU/Linux." (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'prepare-dde + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "Makefile" + (("libbpf ") + "libbpf libmachdev libmachdevdde libddekit")) + (for-each make-file-writable (find-files ".")) + (let ((dde (or (assoc-ref inputs "dde-sources") + (assoc-ref native-inputs "dde-sources")))) + (for-each (lambda (dir) + (copy-recursively + (string-append dde "/" dir ) dir)) + '("libmachdev" "libmachdevdde" "libddekit"))) + #t)) (add-before 'build 'pre-build (lambda _ ;; Don't change the ownership of any file at this time. @@ -472,6 +487,7 @@ fsysopts / --writable\n")) ("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemo= nize ("unifont" ,unifont) + ("libpciaccess" ,libpciaccess) =20 ;; Tools for the /libexec/* scripts. ("bash-minimal" ,bash-minimal) @@ -492,7 +508,20 @@ fsysopts / --writable\n")) (arguments `(#:system "i686-linux"))) mig)) ("perl" ,perl) - ("texinfo" ,texinfo-4))) + ("texinfo" ,texinfo-4) + ("dde-sources" + ;; This is the current tip of the dde branch + ,(let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/incubator.g= it") + (commit commit))) + (sha256 + (base32 + "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692")) + (file-name (string-append "dde-checkout-" + (string-take commit 7)))))))) (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "The kernel servers for the GNU operating system") --=20 2.25.1