From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IZHRGfxVYWQOvAAASxT56A (envelope-from ) for ; Sun, 14 May 2023 23:43:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GH0WGPxVYWTq8AAAG6o9tA (envelope-from ) for ; Sun, 14 May 2023 23:43:24 +0200 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 1644A310D7 for ; Sun, 14 May 2023 23:43:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyJUf-0001sp-9X; Sun, 14 May 2023 17:43:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pyJUd-0001ox-Af for guix-patches@gnu.org; Sun, 14 May 2023 17:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pyJUd-0003wR-2b for guix-patches@gnu.org; Sun, 14 May 2023 17:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyJUc-0002ZW-Fy for guix-patches@gnu.org; Sun, 14 May 2023 17:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63508] [PATCH 2/3] gnu: eudev: Convert build arguments to gexps. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 May 2023 21:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63508 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63508@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 63508-submit@debbugs.gnu.org id=B63508.16841005669850 (code B ref 63508); Sun, 14 May 2023 21:43:02 +0000 Received: (at 63508) by debbugs.gnu.org; 14 May 2023 21:42:46 +0000 Received: from localhost ([127.0.0.1]:41734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyJUL-0002Ym-D7 for submit@debbugs.gnu.org; Sun, 14 May 2023 17:42:45 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:39696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyJUJ-0002YI-GM for 63508@debbugs.gnu.org; Sun, 14 May 2023 17:42:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=bglLQLbZ+wT7DhV TX6m8DFjNzcNQ01DSOtqRaqcTcD0=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=XW1klxHvLwtijsKX9DRf3G1t81QbALAzSA5U6S1r lDrA5zXLLS1u/RogfoPkZ0opgzxaj1NF4cKI1VObOrWjtaQKu+OwL47ZUqlA/VLDwSrZ8T GZF7DnyI5yQgky0mlZvKL4mqd0cIm7ipEa8Mb1C11bkvFpdM7kbErqmk+EhZA= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id e61cb43a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 14 May 2023 21:42:42 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id c38e0e3f; Sun, 14 May 2023 21:42:41 +0000 (UTC) Date: Sun, 14 May 2023 14:42:30 -0700 Message-Id: <85af3647b4729638ce33464c835095edc6e208bd.1684100044.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684100604; a=rsa-sha256; cv=none; b=A6SEo/JWq0uCrl4iw1522/6YG78nkpFDLIXQo1T91VaFUd1bY7W//0Fkj1IsUkkcGPXkF8 tNKrLrLKPsVqTebZPcsR4nMml8rS48SOMzytqwCWZFHVN/N+eEVwh+obgX6jlhOze4vKpz URSnCavNslaBYKpoQNaFcDZ4M8e01W3geDvzFeiYy6d2CJR7qhMPNNMzUzVft8vIWwbHxG sWt0rAKwBGAGUOZxn9UX8JwE6fhPg8/mMTLROhZwgRLm8p08mOzfKhzcHlLOBTmHhhe2ZU 7Dwdx3PTZdK1Nlkq/VlE+0ELwRG2gIED5SHHI+ASnRiDxXb/Zx+HhFLS0mXhuw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=XW1klxHv; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684100604; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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:dkim-signature; bh=EnIY3Z49CKBiQzIg/ZpF87ZRbPXE+M333sDBXwKOXV4=; b=sCjdhcfUz8V+SRg1Hjvl4RaLj3WOBwhfJ13LRImgMHF557gtDmI42dxhTiwu3RdffhabzA p8Ros7nXq/EWALERpCkE29BGStrdXs6J6YX5zXr+t4se7EeWDV+DNJIh2BuRUvoSD5JElR 3K6G5aHFP2PmCwYop5v62+dUp0boCUDv84tKsL/OJZRXSWjJE2R9Hi71Avkp7ZTyaI12Y5 oabzS79/c6t+f424shfL2narux4lzH13PlFxU5aXBTBCI8yIQXX2Y5YfjtRk+v8ATlVA/2 uiXZzbnJtt1yB4ozmYQb+fFEo/LrlqyLIYJg8cLTobcfEtPWLMJbONXUgwIdbw== X-Migadu-Spam-Score: -1.91 X-Spam-Score: -1.91 X-Migadu-Queue-Id: 1644A310D7 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=XW1klxHv; dmarc=pass (policy=none) header.from=gnu.org; 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-TUID: ig3o/gjmpOgT * gnu/packages/linux.scm (eudev): Convert build arguments to gexps. --- gnu/packages/linux.scm | 68 ++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7ae34d1d4a..98e683bdb0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4153,42 +4153,38 @@ (define-public eudev (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-file-names - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (substitute* "man/make.sh" - (("/usr/bin/xsltproc") - (string-append (assoc-ref - (or native-inputs inputs) "xsltproc") - "/bin/xsltproc"))))) - (add-after 'install 'move-static-library - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static")) - (source (string-append out "/lib/libudev.a")) - (target (string-append static "/lib/libudev.a"))) - (mkdir-p (dirname target)) - (link source target) - (delete-file source) - ;; Remove reference to the static library from the .la file - ;; such that Libtool looks for it in the usual places. - (substitute* (string-append out "/lib/libudev.la") - (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda* (#:key outputs #:allow-other-keys) - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - (let ((out (assoc-ref outputs "out"))) - ,@(if (%current-target-system) - '(#t) - '((invoke (string-append out "/bin/udevadm") - "hwdb" "--update"))))))) - #:configure-flags (list "--enable-manpages"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'bootstrap 'patch-file-names + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (substitute* "man/make.sh" + (("/usr/bin/xsltproc") + (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (add-after 'install 'move-static-library + (lambda _ + (let ((source (string-append #$output "/lib/libudev.a")) + (target (string-append #$output:static "/lib/libudev.a"))) + (mkdir-p (dirname target)) + (link source target) + (delete-file source) + ;; Remove reference to the static library from the .la file + ;; such that Libtool looks for it in the usual places. + (substitute* (string-append #$output "/lib/libudev.la") + (("old_library=.*") + "old_library=''\n"))))) + (add-after 'install 'build-hwdb + (lambda _ + ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and + ;; similar tools to display product names. + ;; + ;; XXX: This can't be done when cross-compiling. Find another way + ;; to generate hwdb.bin for cross-built systems. + #$@(if (%current-target-system) + #~(#t) + #~((invoke (string-append #$output "/bin/udevadm") + "hwdb" "--update")))))) + #:configure-flags #~(list "--enable-manpages"))) (native-inputs (list autoconf automake -- 2.40.1