From patchwork Thu Aug 24 04:16:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53180 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 7BB0627BBE9; Thu, 24 Aug 2023 05:23:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9D04127BBE2 for ; Thu, 24 Aug 2023 05:23:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ1s5-0008Rb-B8; Thu, 24 Aug 2023 00:23:01 -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 1qZ1s3-0008RB-C9 for guix-patches@gnu.org; Thu, 24 Aug 2023 00:22: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 1qZ1s3-0006u6-3x for guix-patches@gnu.org; Thu, 24 Aug 2023 00:22:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZ1s6-0004jX-RD for guix-patches@gnu.org; Thu, 24 Aug 2023 00:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH 58/61] gnu: perf: Remove libxml2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Aug 2023 04:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169285095418151 (code B ref 65479); Thu, 24 Aug 2023 04:23:02 +0000 Received: (at 65479) by debbugs.gnu.org; 24 Aug 2023 04:22:34 +0000 Received: from localhost ([127.0.0.1]:35839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1rd-0004ig-Un for submit@debbugs.gnu.org; Thu, 24 Aug 2023 00:22:34 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:40952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1rc-0004iZ-6l for 65479@debbugs.gnu.org; Thu, 24 Aug 2023 00:22:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id A94B020608 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:22:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 269B58009C for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id qnlYpj2B4M3F for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:54 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B7D238009A for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:16:54 +0200 (CEST) From: Bruno Victal Date: Thu, 24 Aug 2023 05:16:54 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches XML_CATALOG_FILES is already set within xmlto which is a requirement for building the documentation. Note: perf depends on zlib which was propagated by libxml2 so we must re-add it here. * gnu/packages/linux.scm (perf)[inputs]: Remove libxml2. Add zlib. Relocate docbook-xsl, xmlto and asciidoc to … [native-inputs]: … here. --- gnu/packages/linux.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 140d2e4dd3..5b117bb029 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5046,20 +5046,20 @@ (define-public perf ;; There are build scripts written in these languages. perl python-2 - python-3)) + python-3 + ;; Documentation + docbook-xsl + xmlto + asciidoc)) (inputs (list slang ;for the interactive TUI + zlib ;; newt python-2 ;'perf' links against libpython elfutils libiberty ;used alongside BDF for symbol demangling libunwind ;better stack walking - numactl ;for 'perf bench numa mem' - ;; Documentation. - libxml2 ;for $XML_CATALOG_FILES - docbook-xsl - xmlto - asciidoc)) + numactl)) ;for 'perf bench numa mem' (home-page "https://perf.wiki.kernel.org/") (synopsis "Linux profiling with performance counters") (description