From patchwork Mon Oct 9 20:06:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54697 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 B3D5627BBE9; Mon, 9 Oct 2023 22:19:53 +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=ham 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 04B6627BBE2 for ; Mon, 9 Oct 2023 22:19:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxeO-0007Y5-78; Mon, 09 Oct 2023 17:18:52 -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 1qpxeI-0007VW-Lv for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -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 1qpxeI-0006yi-BE for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpxed-0007fD-3q; Mon, 09 Oct 2023 17:19:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 59/63] gnu: perf: Remove libxml2. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 21:19:07 +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 Cc: Bruno Victal , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169688632529304 (code B ref 65479); Mon, 09 Oct 2023 21:19:07 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:45 +0000 Received: from localhost ([127.0.0.1]:33539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxeH-0007ca-0X for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:45 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:57114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxeE-0007cR-VK for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:43 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id D4E3D20C81 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5A32E80095; Mon, 9 Oct 2023 23:17:42 +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 QMlP8WaFxxP1; Mon, 9 Oct 2023 23:17:42 +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 DEE938009A; Mon, 9 Oct 2023 23:17:41 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:47 +0100 Message-ID: <76d8b4fe2e997c8a586d5a886ce74f7c9729e952.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 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 7f9cafaf1b..66f9810d3c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5086,21 +5086,21 @@ (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 libtraceevent - 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