From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id MLOQCTdtAGfTaAAAe85BDQ:P1 (envelope-from ) for ; Fri, 04 Oct 2024 22:33:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id MLOQCTdtAGfTaAAAe85BDQ (envelope-from ) for ; Sat, 05 Oct 2024 00:33:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=mlusdDXW; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=DgC3H+d7; 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-Seal: i=1; s=key1; d=yhetil.org; t=1728081206; a=rsa-sha256; cv=none; b=aNxSm5jZfzGMTINRYhuUStyaETGGtbB4ns5rTqXybiX+D+5iNRhPgMNw0d2Axf1v9fRfam W3U584PtTPlLYq/czC2+xDvVqz9J7/5m3I1nKMWordYFz4Vi3HFKdd7wSp+8KRFuVc+rRg OfiKg8DflMqKDKwOSyJ8KvkzF0/Y/RHqwtb4IOo0w6ujHo7kqrZE4Xpw+yhrJhuoRoZVRe 8p068fKljjdFy9AFPwS+SvEkf69e9ggAqFm0RHb/rpAyxw73XpSLUD4qQnY4Ic9feWsnae 9he/ZB8OifMd22+Ox117//2Rb5s8fKwdLdDmkKVV6BQPuYVxliae7nsZnGjbMg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=mlusdDXW; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=DgC3H+d7; 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=1728081206; 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-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:dkim-signature; bh=alMyXfrwJPaXbi4KpmmDofuX0bB2CVcYAa7cdWVrR38=; b=UgNOolc7JPkCq6/Q/axo6FiMznKM3kfPCNYUcczIL8hsSi0TgX9getCok8NNSbziRV1HJo qt3m3tXu1kIL+d0cSuCxZt5F7dcaFSYflWeZO/HgzoNn/dYsIP67esNO+R++XD3DRKeDnG OX85nPNs0zboHD14CsJlDnxk24rAmX6XYQpbErtrt6K/nQBACUxw1JGJQBk+yg7syjtUNe 21fGTYaoHB1Zl3bYk0XFTGfWaTROmidiS0lWo4ZwV4KoS9ThKkoLMCMsjRQBoZKN+dxRO2 GOJ+HJDlvMNGau6Gi2PDVLOijePBJWRNr1Ty410q0T2nW7U8gpvQhLQr4Spbfg== 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 AB0DC88281 for ; Sat, 05 Oct 2024 00:33:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1swqr6-0000FD-Lx; Fri, 04 Oct 2024 18:33:00 -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 1swqr5-0000EN-7b for guix-patches@gnu.org; Fri, 04 Oct 2024 18:32:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1swqr4-0004Gq-VF for guix-patches@gnu.org; Fri, 04 Oct 2024 18:32:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=alMyXfrwJPaXbi4KpmmDofuX0bB2CVcYAa7cdWVrR38=; b=mlusdDXWdiscw6w+weD3lXl/hMyq2nAuP1w4UEGA3p/4KLSEyZ0lfnoKcemGLVObPZcj6K0HP/PFI0XN3cdd9OpttmdjIQXv5vpe8BlEGOk/03GKqSmKqFjmRPZBR1mm2w0Kqa7rTg/1qkcVAYVL70kG6qoSsn5IuYqQybSLaztZzxFYtGNV7UZ3I5qefc6OfWjIZbBPfqkznROXlw9IpCOVFq2csPN/qdzOPZwxYaz/6CCBl4ZwG+KohZjjLYMVfgb9Za3KIWvgcozIuNgalsxlzuC8Vb3awRok5GSszGCmFYm3mO27y1SUdjU8Vaa7+9s7tYnt1mwhcbwwpvwjcQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1swqr8-0001QI-Ef for guix-patches@gnu.org; Fri, 04 Oct 2024 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73260] [PATCH v2 3/3] gnu: Add libguestfs. Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Oct 2024 22:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 73260@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 73260-submit@debbugs.gnu.org id=B73260.17280811465404 (code B ref 73260); Fri, 04 Oct 2024 22:33:02 +0000 Received: (at 73260) by debbugs.gnu.org; 4 Oct 2024 22:32:26 +0000 Received: from localhost ([127.0.0.1]:36782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swqqX-0001P5-WC for submit@debbugs.gnu.org; Fri, 04 Oct 2024 18:32:26 -0400 Received: from confino.investici.org ([93.190.126.19]:49823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swqqW-0001Oy-I1 for 73260@debbugs.gnu.org; Fri, 04 Oct 2024 18:32:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1728081133; bh=alMyXfrwJPaXbi4KpmmDofuX0bB2CVcYAa7cdWVrR38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DgC3H+d7GGiZh8tDyaTyHf0vPmqg1bOCU4A4FoHZ2leM5aG6+1EEwaKNReMOlcU3j dKteYmw+05uGydbbydrI757ZTfq3kndoO5aFeUpWKtnRTftCjdCtprxRWmNVBQTj8r 20wVjXGqXWS1ZMZIjJGmYrFQ9jzP3Sw0JB6p9hQA= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4XL3FT1KLKz11H1; Fri, 4 Oct 2024 22:32:13 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4XL3FT0ZV9z11C9; Fri, 4 Oct 2024 22:32:13 +0000 (UTC) Date: Sat, 5 Oct 2024 00:31:44 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <42a57a06130e77a6471ea9717a670306283ecb51.1728081104.git.goodoldpaul@autistici.org> References: <42a57a06130e77a6471ea9717a670306283ecb51.1728081104.git.goodoldpaul@autistici.org> 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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches From: Giacomo Leidi 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.43 X-Spam-Score: 0.43 X-Migadu-Queue-Id: AB0DC88281 X-Migadu-Scanner: mx12.migadu.com X-TUID: m4pQ358emdmG * gnu/packages/virtualization.scm (libguestfs): New variable. Change-Id: I99243550a7a6c9d787fa1a67e54acefd3deeaf1f --- gnu/packages/virtualization.scm | 90 +++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4d3d7502f1..bfca5885c6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -61,6 +61,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages apparmor) #:use-module (gnu packages assembly) #:use-module (gnu packages attr) + #:use-module (gnu packages apparmor) #:use-module (gnu packages augeas) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) @@ -81,6 +82,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages dbm) #:use-module (gnu packages debian) #:use-module (gnu packages disk) #:use-module (gnu packages dns) @@ -103,6 +105,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) + #:use-module (gnu packages java) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-check) @@ -113,6 +116,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages libbsd) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages multiprecision) @@ -3138,3 +3142,89 @@ (define-public libguestfs-minimal guests, P2V, V2V, performing backups, cloning VMs, building VMs, formatting disks, resizing disks, and much more.") (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public libguestfs + (package/inherit libguestfs-minimal + (name "libguestfs") + (arguments + (substitute-keyword-arguments (package-arguments libguestfs-minimal) + ((#:configure-flags flags) + #~(append + (filter + (lambda (flag) + (not (string-prefix? "LDFLAGS" flag))) + #$flags) + (list + "--enable-vala=yes" + (string-append "--with-python-installdir=" + #$output "/lib/python" + #$(version-major+minor + (package-version python)) + "/site-packages") + (string-append "LDFLAGS=-Wl,-rpath," %output "/lib")))) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'patch-makefiles 'patch-additional-makefiles + (lambda _ + (let* ((current-system (or #$(%current-target-system) + #$(%current-system))) + (lib (string-append #$output "/lib")) + (share (string-append #$output "/share")) + (completions + (string-append share "/bash-completion/completions")) + (lib/lua (string-append lib "/lua")) + (lib/ocaml (string-append lib "/ocaml")) + (ruby-version + #$(package-version + (this-package-native-input "ruby"))) + (ruby-libdir + (string-append lib + "/ruby/site_ruby/" + ruby-version)) + (ruby-archdir + (string-append ruby-libdir "/" current-system))) + (substitute* "m4/guestfs-bash-completion.m4" + (("`pkg-config --variable=completionsdir bash-completion`") + completions)) + (substitute* "ocaml/Makefile.am" + (("\\$\\(DESTDIR\\)\\$\\(OCAMLLIB\\)") + lib/ocaml)) + (substitute* "lua/Makefile.am" + (("\\$\\(DESTDIR\\)\\$\\(lualibdir\\)") + lib/lua)) + (substitute* "ruby/Makefile.am" + (("\\$\\(DESTDIR\\)\\$\\(RUBY_ARCHDIR\\)") + ruby-archdir) + (("\\$\\(DESTDIR\\)\\$\\(RUBY_LIBDIR\\)") + ruby-libdir)) + ;; The ‘validate-runpath’ phase fails to find libguestfs.so.0. + (substitute* "ruby/ext/guestfs/extconf.rb.in" + (("create_header") + (string-append " +$LDFLAGS += \" -Wl,-rpath=" #$output "/lib \" +create_header")))))))))) + (native-inputs + (modify-inputs (package-native-inputs libguestfs-minimal) + (prepend autoconf + automake + bash-completion + cdrtools + gobject-introspection + python + ruby + util-linux + vala))) + (inputs + (modify-inputs (package-inputs libguestfs-minimal) + (prepend acl + bdb + fuse + gmp + libapparmor + libcap + libcap-ng + libconfig + libvirt + libxcrypt + numactl + yajl))))) -- 2.46.0