From patchwork Thu Sep 19 07:38:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 68132 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 6984D27BBEA; Thu, 19 Sep 2024 08:42:02 +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=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 6278627BBE2 for ; Thu, 19 Sep 2024 08:41:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srBnO-0003tE-SM; Thu, 19 Sep 2024 03:41:46 -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 1srBnN-0003sq-5k for guix-patches@gnu.org; Thu, 19 Sep 2024 03:41:45 -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 1srBnM-0002jU-RP for guix-patches@gnu.org; Thu, 19 Sep 2024 03:41:44 -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=0TY1ZFMWmHvgLsB1RrDRFA4vUejzziUSMHzqJnFHVw4=; b=NVQXL2S0+1faGOa0e5IRd8rf52AaIQXFgcVi4AgfJCFMROh6IMf3Ds+AFt+Mi4CLwaYhdf50kCc7nD+T+mge/ACzIoF6GnKt2ihVceqmTW6qnnYDJtp9i59WOu60BDhOmNjUen8CO/7fZBSkLcWbot1CaWUT13R24+3v6PwhwmcgCPxwncSeeqaSdyENXOM4zZS4hFYZ92XLGOidgVAE/Ngolgn82IqVvArRot7vWASGMg55BcEGSqrE/nfgEB4KWhl2jq+lGqOGbWsWeAt7DgiYZOMDYQ3Caxy7YM6zZQMwH9tQFAU/jqLmxAo7jXu2Wnm3VARLePcReA6Ii5T/Tw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srBnd-0005GS-T7 for guix-patches@gnu.org; Thu, 19 Sep 2024 03:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73190] [PATCH v2 3/3] gnu: dyninst: Update to 13.0.0. Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Sep 2024 07:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73190@debbugs.gnu.org Cc: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Received: via spool by 73190-submit@debbugs.gnu.org id=B73190.172673167120160 (code B ref 73190); Thu, 19 Sep 2024 07:42:01 +0000 Received: (at 73190) by debbugs.gnu.org; 19 Sep 2024 07:41:11 +0000 Received: from localhost ([127.0.0.1]:59740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srBml-0005F1-SK for submit@debbugs.gnu.org; Thu, 19 Sep 2024 03:41:11 -0400 Received: from layka.disroot.org ([178.21.23.139]:39458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srBmg-0005Ei-UV for 73190@debbugs.gnu.org; Thu, 19 Sep 2024 03:41:06 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3B12623D18; Thu, 19 Sep 2024 09:40:45 +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 L9osUQ7cioIS; Thu, 19 Sep 2024 09:40:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1726731640; bh=4BCaP9fRVg7dWvGBiwd9+aKRNtDaJGi9rOWQZ7qnf44=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UgnVHhk8Hzi7GmWZeaOg8M8CHb25Tz+sezKXR7OiQRs4b3A0elZqDZrgrz3I+BWle zuPHHFm+tJaSlWVcMOTmFXKg1aqqWpf7nyv+Ex2OWDiADqYCKfy5a4upMK07sdSDey KXw9vD4WH1+W+0z58dR4HnTbt6K7ctaH28QKq70s8t6NPirfI+mbtdcUdZG47aUN5D U5tzRH2j19qQtnJ4PdqMbU+lLSEOngPuSSNJ7V0W4uA4s3B3AcC+d8e8W7DN33526d VSGDsGJsK1rcxyaKAP0JSENKbjgT93PZcryApXUrDRyPtD4y1IEkcizG5n5R5h301d gGy0eRjTp043w== Date: Thu, 19 Sep 2024 16:38:40 +0900 Message-ID: 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: , 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: "ashish.is--- 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 * gnu/packages/instrumentations.scm (dyninst): Update to 13.0.0. [propagated-inputs]: Add libiberty. * gnu/packages/patches/dyninst-fix-glibc-compatibility.patch: Remove file. Change-Id: I6e5dfa9d698de4d45614c535b5dd5cdaad239425 --- This patch is identical as v1. gnu/local.mk | 1 - gnu/packages/instrumentation.scm | 17 +++++----- .../dyninst-fix-glibc-compatibility.patch | 33 ------------------- 3 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/dyninst-fix-glibc-compatibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index bdc740ead6d2..3435b7850eb3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1160,7 +1160,6 @@ dist_patch_DATA = \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dwarves-threading-reproducibility.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ - %D%/packages/patches/dyninst-fix-glibc-compatibility.patch \ %D%/packages/patches/efivar-211.patch \ %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \ %D%/packages/patches/einstein-build.patch \ diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index f8bc2702bc37..0cc9a3a8d751 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021, 2022 Olivier Dion ;;; Copyright © 2023 Andy Tai ;;; Copyright © 2023 Marius Bakke +;;; Copyright © 2024 Nguyễn Gia Phong ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ (define-module (gnu packages instrumentation) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) @@ -202,9 +204,7 @@ (define-public barectf (define-public dyninst (package (name "dyninst") - ;; Newer versions are not promoted on main home page. - ;; Upgrade to 12.0.1 if anyone require a newer version. - (version "10.2.1") + (version "13.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -212,9 +212,8 @@ (define-public dyninst (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m04pg824rqx647wvk9xl33ri8i6mm0vmrz9924li25dxbr4zqd5")) - (patches - (search-patches "dyninst-fix-glibc-compatibility.patch")))) + (base32 + "0vkd9z6zwvn13ynfys2fg5yanv7n9pl7x5z8m1lcnmnb0kwgi035")))) (build-system cmake-build-system) (arguments @@ -238,10 +237,10 @@ (define-public dyninst (add-after 'unpack 'patch-bad-logic (lambda _ (substitute* "dyninstAPI/src/linux.C" - (("if\\(\\!fgets\\(buffer, 512, ldconfig\\)\\)") - "fgets(buffer, 512, ldconfig); if (false)"))))))) + (("if\\(fgets\\(buffer, buffer_size, ldconfig\\)\\)") + "fgets(buffer, buffer_size, ldconfig); if (true)"))))))) (propagated-inputs - (list elfutils boost tbb-2020)) + (list elfutils libiberty boost tbb)) (home-page "https://dyninst.org/") (synopsis "Dynamic instrumentation") (description "Dyninst is a collection of libraries for instrumenting, diff --git a/gnu/packages/patches/dyninst-fix-glibc-compatibility.patch b/gnu/packages/patches/dyninst-fix-glibc-compatibility.patch deleted file mode 100644 index cd018da6cce1..000000000000 --- a/gnu/packages/patches/dyninst-fix-glibc-compatibility.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f233c46ac7b415104d04e4bb74bd7a0fcf24a333 Mon Sep 17 00:00:00 2001 -From: Olivier Dion -Date: Thu, 15 Jun 2023 12:02:08 -0400 -Subject: [PATCH] Fix compatibility with glibc 2.35 - -Something has change with the visibility of the _r_debug structure in -glibc 2.35. See this issue -. - -This patch is essentially the upstream fix - -backported. - -Signed-off-by: Olivier Dion ---- - dyninstAPI_RT/src/RTlinux.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/dyninstAPI_RT/src/RTlinux.c b/dyninstAPI_RT/src/RTlinux.c -index fc231d0a4..2f17ff677 100644 ---- a/dyninstAPI_RT/src/RTlinux.c -+++ b/dyninstAPI_RT/src/RTlinux.c -@@ -406,7 +406,6 @@ void dyninstTrapHandler(int sig, siginfo_t *sg, ucontext_t *context) - #if defined(cap_binary_rewriter) - - extern struct r_debug _r_debug; --DLLEXPORT struct r_debug _r_debug __attribute__ ((weak)); - - /* Verify that the r_debug variable is visible */ - void r_debugCheck() { assert(_r_debug.r_map); } --- -2.40.1 -