From patchwork Sat Apr 11 12:05:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 21187 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4F49627BBE4; Sat, 11 Apr 2020 13:07:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CEE1E27BBE1 for ; Sat, 11 Apr 2020 13:07:24 +0100 (BST) Received: from localhost ([::1]:51288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNEuy-0007AH-Ba for patchwork@mira.cbaines.net; Sat, 11 Apr 2020 08:07:24 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#40552] [PATCH] gnu: hurd: Build DDE libraries. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Apr 2020 12:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40552 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40552@debbugs.gnu.org Cc: Ricardo Wurmus X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158660675413127 (code B ref -1); Sat, 11 Apr 2020 12:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2020 12:05:54 +0000 Received: from localhost ([127.0.0.1]:56204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNEtS-0003Pa-H0 for submit@debbugs.gnu.org; Sat, 11 Apr 2020 08:05:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:36098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNEtR-0003PT-KM for submit@debbugs.gnu.org; Sat, 11 Apr 2020 08:05:49 -0400 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 ARC-Seal: i=1; a=rsa-sha256; t=1586606742; cv=none; d=zohomail.com; s=zohoarc; b=l1JU1GoucD//xUxTbZw+sE1KXK1yEETvLRtqeFPR7AMeBlHUjbYhkMTN7hT9zRY2QO5O3nKjQd2VB47j9FLceWZdf6X4xlj3DqVXT4qUn0TdnQCwnKYLMQlehPDY06lcFbAxi0PI96ZLqZIZgi6epfCoNjsk1P5ZAXlBhlQIxEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586606742; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=n1ZB1RkZg31A7MTVJjr8rgw6lX92caQnk0yKnh/qTzM=; b=drJMHtBV3Zfw87zteJ+pCUtr0GdT86d/uk+Yy2UhnUBBiTs5bYI8ON42b7DLkSdjsNLTscxOpgRANOKA2idwBh7tlYfSlwSMrbeSskLCecs1/ysmt/Lv23sGxvaHlTSBtmC2uF9eCvwpkCMdmV4a1tniyPw//2dTc6qF7Hso1E8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1586606742; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=n1ZB1RkZg31A7MTVJjr8rgw6lX92caQnk0yKnh/qTzM=; b=SWCpOecWXhwcJOLB7M2Tc9p0+XOPbjqXQOpnWkc9DmVJxzQxUb94vG6FvyLvSEtp 1NZfNLhxPV0g97cg3A33/nReb42u8rHeXuUTy+TLsHZ9UH36w7GfJYgf2z4ArC+nc/A rUTJGBlxJ1zz0NKrck8T97iBRvHrnEWhuAPTiowU= Received: from localhost (p4FD5A111.dip0.t-ipconnect.de [79.213.161.17]) by mx.zohomail.com with SMTPS id 1586606739967538.2334898070086; Sat, 11 Apr 2020 05:05:39 -0700 (PDT) From: Ricardo Wurmus Message-ID: <20200411120532.1660-1-rekado@elephly.net> Date: Sat, 11 Apr 2020 14:05:32 +0200 X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-ZohoMailClient: External X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 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 --daemonize ("unifont" ,unifont) + ("libpciaccess" ,libpciaccess) ;; 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.git") + (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")