From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kBNIGcM1AWKmdwAAgWs5BA (envelope-from ) for ; Mon, 07 Feb 2022 16:07:47 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8O+MFcM1AWJbcgEAauVa8A (envelope-from ) for ; Mon, 07 Feb 2022 16:07:47 +0100 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 453F213ABF for ; Mon, 7 Feb 2022 16:07:45 +0100 (CET) Received: from localhost ([::1]:48134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH5cF-00059Q-Sb for larch@yhetil.org; Mon, 07 Feb 2022 10:07:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nH50W-0007aj-4H for guix-patches@gnu.org; Mon, 07 Feb 2022 09:28:44 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nH4zr-0006TV-AL for guix-patches@gnu.org; Mon, 07 Feb 2022 09:28:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nH4zr-0007Kj-7F for guix-patches@gnu.org; Mon, 07 Feb 2022 09:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53779] [PATCH v2 3/6] gnu: iwd: Build from Git sources. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 14:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53779 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53779@debbugs.gnu.org Received: via spool by 53779-submit@debbugs.gnu.org id=B53779.164424403228093 (code B ref 53779); Mon, 07 Feb 2022 14:28:03 +0000 Received: (at 53779) by debbugs.gnu.org; 7 Feb 2022 14:27:12 +0000 Received: from localhost ([127.0.0.1]:41356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nH4z1-0007Iw-Rh for submit@debbugs.gnu.org; Mon, 07 Feb 2022 09:27:12 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:54990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nH4yh-0007H7-PJ for 53779@debbugs.gnu.org; Mon, 07 Feb 2022 09:26:56 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 94F4374649 for <53779@debbugs.gnu.org>; Mon, 7 Feb 2022 14:26:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YMHsMAmP-1Wc for <53779@debbugs.gnu.org>; Mon, 7 Feb 2022 14:26:46 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 04CFE74647 for <53779@debbugs.gnu.org>; Mon, 7 Feb 2022 14:26:46 +0000 (UTC) From: Simon South Date: Mon, 7 Feb 2022 09:26:28 -0500 Message-Id: <0093dadfa3d4c1d82aa7464415870f9f0149ea85.1644243309.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: 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: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644246465; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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; bh=kmm89wMH14Et/sW5FQEXPbY2HML6aoa6C4yTPEgPcTA=; b=soDytnYxz1RivguG5sEyvHSUpzVgx7Z0FCbfxGhWfgjY7EYWvyRtHYzUZwnglzMfei61Kg i9URqoyWCiJ/7C8FxDNykOMNiNDLQVROznjPIhFDmpMDTkhgv4xkGFlKlt+4bq84mLI9Ru XCgcjGu53flyprRDPyESgrBP0S+1NMYoW73ViFetIDvfQu6OIjOG1niG6qnAzc3BGhAuS7 wXR8VwoH/2qlLmxujr0t3QAFhAolvsMCrQdgMp0Bv517HXJIE22SH3BcDaS2lEHo2P9Dkd ir3DBBJywNP/U1HAsTeT3Rd/UNMiLEzo6aI5+GCD0TQufpNv3Nwz0XXrorHmig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644246465; a=rsa-sha256; cv=none; b=ox3+EQQI415s9MzdSTup1+DTmpoONfPYp43d5X44NEwuOkpnc5dVE/PD4NPv4YAZFmSb6a IxBSbfFbITNW9fMm3Gls93uYT0LW1vv8rmrinkGRMfQmbC2BHlLM8GKFHD3wpuEgv+TSjm FDn+6mz1wbUeOwRGoMSvMm05nAlV/ZIcYdmNV75fRpHF84euSYGFHHseOeHDwVkiHBWM1q RHue/uMojCT8qBSqDPqR5sQZGgqmohuW9msYe9Q20XPOi05w/41iaQpbuPS02lomyr9Q+x s5XPeDU1rjEhpfQtspWp9V5O0WfSOUgAaTz0eNuGzIX2PzL6IlwC/5GkjpqXrw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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" X-Migadu-Spam-Score: -2.33 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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" X-Migadu-Queue-Id: 453F213ABF X-Spam-Score: -2.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: r82HVXMHJWtc * gnu/packages/networking.scm (iwd)[source]: Use "git-fetch" and "git-file-name". [inputs]: Add ell source code. [native-inputs]: Add autoconf, automake, libtool. [arguments]<#:phases>: Add "copy-ell-header-files" phase to copy shared header files from ell source into source tree. --- gnu/packages/networking.scm | 38 ++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ef0ae12e49..382b4cf96d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2021 Milkey Mouse ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2022 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -3564,20 +3565,25 @@ (define-public iwd (name "iwd") (version "1.20") (source (origin - ;; FIXME: We're using the bootstrapped sources because - ;; otherwise using an external ell library is impossible. - ;; How to bootstrap with Guix? - (method url-fetch) - (uri (string-append "https://www.kernel.org/pub/linux/network" - "/wireless/iwd-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "03q5scahyg86h4bdxqxm32shyssgpmfp5b3183j01ig7mg6f4lbx")))) + "0xlbnsgw9giakfj0xr526i7mcwyaryb18g66mv90njnrm8radjhr")))) (build-system gnu-build-system) (inputs - (list dbus ell readline)) + (list dbus ell (package-source ell) readline)) (native-inputs - (list pkg-config python python-docutils openssl)) + (list autoconf + automake + libtool + pkg-config + python + python-docutils + openssl)) (arguments `(#:configure-flags ,#~(list "--disable-systemd-service" @@ -3591,6 +3597,20 @@ (define-public iwd #$output "/share/dbus-1/system-services")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'copy-ell-header-files + ;; Copy into the source tree two of ell's private header files that + ;; it shares with iwd, as is required to build with the + ;; "--enable-external-ell" configure option. + ;; See the definition of "ell_shared" in iwd's Makefile.am. + (lambda* (#:key inputs #:allow-other-keys) + (let ((ell-header-dir (search-input-directory inputs "/ell")) + (target-dir "ell")) + (mkdir target-dir) + (for-each + (lambda (file-name) + (copy-file (string-append ell-header-dir "/" file-name) + (string-append target-dir "/" file-name))) + '("asn1-private.h" "useful.h"))))) (add-after 'configure 'patch-Makefile (lambda _ (substitute* "Makefile" -- 2.34.0