From patchwork Thu Sep 26 09:21:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?s=C3=A9bastien_via_Guix-patches_via?= X-Patchwork-Id: 31491 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 47A8127BBE9; Thu, 26 Sep 2024 10:25:47 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 7551427BBE2 for ; Thu, 26 Sep 2024 10:25:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stkkj-00061T-Pa; Thu, 26 Sep 2024 05:25:38 -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 1stkkh-00061E-G1 for guix-patches@gnu.org; Thu, 26 Sep 2024 05:25:36 -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 1stkkh-0001VO-7L for guix-patches@gnu.org; Thu, 26 Sep 2024 05:25:35 -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:Date:From:To:Subject; bh=01WWXXXxvEVljUTK/hDQHbWf3DdLwDsNw0oDuh+ir5I=; b=aUiDBikF1tRfHmwfCxnrD1rp7UJOdxzRyBiodmpmnp+SBhWSPESC7nwQkm4cyE7ekVD8U4HYYse290AcAeHTYWB5kjnImI9hHctOJ1DN1zJYeD8yqgXuL/GVlThjZgPAWbMtjfZVJAvwk2coEWG0BwLNOOigsEOAuCkzZpb33mpl/FctkESBPgLK9idgHzTxYDVTGRPBw0ZyWVMi+rVYQEGZWIeEudXHJswrGlbYOKbwh5Di49dKpd9GFijr5Y/HjR4He+ZQk1FHqcldee0IbAwpF4B2UczotGVxB29m38Y1GwqlvoLtcrG7ZkhPvKpgZuWJb/B0v+SwS9nHKCsKGA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stkl7-00004w-SI for guix-patches@gnu.org; Thu, 26 Sep 2024 05:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73495] [PATCH] gnu: dyninst: Remove patch-bad-logic phase. Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 09:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73495@debbugs.gnu.org Cc: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172734272132140 (code B ref -1); Thu, 26 Sep 2024 09:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Sep 2024 09:25:21 +0000 Received: from localhost ([127.0.0.1]:52968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stkkS-0008MH-Jw for submit@debbugs.gnu.org; Thu, 26 Sep 2024 05:25:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:37452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stkhf-0008BT-9E for submit@debbugs.gnu.org; Thu, 26 Sep 2024 05:22:27 -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 1stkhE-0001nR-1H for guix-patches@gnu.org; Thu, 26 Sep 2024 05:22:00 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stkhB-0000r2-QC for guix-patches@gnu.org; Thu, 26 Sep 2024 05:21:59 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8D51C23DF7; Thu, 26 Sep 2024 11:21:53 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id s9sd2EdI6PwD; Thu, 26 Sep 2024 11:21:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1727342512; bh=WblPy4rKzb6ZOqrTtLVeEWRTJjxONAX6FL0hvoESRdI=; h=From:To:Cc:Subject:Date; b=WqvI+fbZPPPyFW54Xbp0bAZYXJQXuJ+3s2Dq6xCtUogR6+z7y95cXfLMfHdDRZWul J4ntdAVNpznleCLIyeH36nPJnH4YpxYDDLoaoba934kb3jLKn8uFSBlYEytYGoZbQK aSP/1XeaEU5nJGs8gtvNJxWwx6bzuAMcnx6NzQMsos8rGzRasnRlTopH4C68oKe2oX HNcwiXn1DXsuycOi/osmjgQ09+Pp/8ymeYb0ajF/HR8ZnESKHO11y1IjXeJMGuKrKc R2kFGTV03ZEf4CZBmjX4hIfn/G5myap/g9qTyTtP5F6aT65q/aXznXTs28yz27taMX lFxIkBG3UVM7g== Date: Thu, 26 Sep 2024 18:21:29 +0900 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=mcsinyx@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: =?utf-8?q?s=C3=A9bastien_via_Guix-patches_via?= 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 The short circuit logic (return failure to resolve library path if ldconfig not found) is no longer present on Dyninst 13. * gnu/packages/instrumentation.scm (dyninst): Remove patch-bad-logic phase. Fixes: 254c8f2c8cbb ("gnu: dyninst: Update to 13.0.0.") References: https://github.com/dyninst/dyninst/pull/1362 Change-Id: I021ec71416da90d11705ef04fba7c170558ef3c6 --- gnu/packages/instrumentation.scm | 15 --------------- 1 file changed, 15 deletions(-) base-commit: f6715a4715eaed485300dffffa1b5e182ded3cea diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 1b99399913ef..86436130c9e1 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -222,23 +222,8 @@ (define-public dyninst ;; source. #:configure-flags (list "-DSTERILE_BUILD=ON") - ;; NOTE: dyninst needs to search for shared libraries that are linked - ;; against the instrumented binary in order to rebuild the entire - ;; program. For this purpose, one can use LD_LIBRARY_PATH or - ;; DYNISNT_REWRITER_PATHS environment variables to add paths for dyinst - ;; to search. However, dyninst also tries to be smart by executing - ;; ldconfig, which is not portable. If ldconfig is not available on - ;; the system, dyinst wrongly assumes that the shared libraries can not - ;; be found, even though it can. This bad logic is still there with - ;; newer versions of dyinst. Thus, this substitution makes the bad - ;; code path unreachable. #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-bad-logic - (lambda _ - (substitute* "dyninstAPI/src/linux.C" - (("if\\(fgets\\(buffer, buffer_size, ldconfig\\)\\)") - "fgets(buffer, buffer_size, ldconfig); if (true)")))) (add-after 'unpack 'adjust-supported-platform-name (lambda _ ;; That file checks for "i386" but