From patchwork Thu Jun 15 16:32:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 50916 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 14F3727BBE9; Thu, 15 Jun 2023 17:33:21 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 BB26F27BBE2 for ; Thu, 15 Jun 2023 17:33:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9puB-0003f9-OA; Thu, 15 Jun 2023 12:33:03 -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 1q9puA-0003eq-Ft for guix-patches@gnu.org; Thu, 15 Jun 2023 12:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q9puA-0006Is-7B for guix-patches@gnu.org; Thu, 15 Jun 2023 12:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9puA-0001M6-3f for guix-patches@gnu.org; Thu, 15 Jun 2023 12:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64082] [PATCH] gnu: dyninst: fix runtime error with new glibc Resent-From: odion@efficios.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Jun 2023 16:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64082 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64082@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16868467655173 (code B ref -1); Thu, 15 Jun 2023 16:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jun 2023 16:32:45 +0000 Received: from localhost ([127.0.0.1]:47674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9ptt-0001LN-B0 for submit@debbugs.gnu.org; Thu, 15 Jun 2023 12:32:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:50148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9ptr-0001LF-79 for submit@debbugs.gnu.org; Thu, 15 Jun 2023 12:32:43 -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 1q9ptp-0003b7-12 for guix-patches@gnu.org; Thu, 15 Jun 2023 12:32:42 -0400 Received: from smtpout.efficios.com ([167.114.26.122]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9ptm-00066B-S8 for guix-patches@gnu.org; Thu, 15 Jun 2023 12:32:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1686846755; bh=uHZ88Xb71ZlmQSgfydFZ+RaH9HxfGxtHB4QR7qXQu6w=; h=From:To:Cc:Subject:Date:From; b=W5zxllsJxt0HgQwHHtFlDI4IizAQr1otA4de2NVhCRFZUXSbAU8JtgUUwonDJm0Hp nkLM3J/uuNdsVqv+goOQSrin4+ooMfq/eRzNMCPIg7TLva8rIZE+r62LmhIM/+Vwza ifk5XbAJJvGS5puIFS0Uf5mb4RWO6/wNDaO3kH9/m3hGA515JdHAwtYgv0nRp/yHts h2onYoVGmPi601DvbqgcFcUGiIf/QNQUlj6eVSr8/t7HWbg1nE+ohlsU7a9n8RTvqq Z+RkoPbij4qGQWGOpM39+on1y/ZotlGe+ZdQ5V4+ZbSLLZvnhVq+uHjwGjrTj9Vrse FUz/jG/+rD1CA== Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4Qhnrg5WCKz188n; Thu, 15 Jun 2023 12:32:35 -0400 (EDT) From: odion@efficios.com Date: Thu, 15 Jun 2023 12:32:27 -0400 Message-Id: <0a9c6779a942f280f82839de2900394b6b44dba4.1686846742.git.olivier.dion@polymtl.ca> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=167.114.26.122; envelope-from=odion@efficios.com; helo=smtpout.efficios.com 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , 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 From: Olivier Dion * gnu/packages/instrumentation.scm (dyninst): fix the error [source]: add patch. * gnu/packages/patches/dyninst-fix-glibc-compatibility.patch: New file. --- gnu/packages/instrumentation.scm | 5 ++- .../dyninst-fix-glibc-compatibility.patch | 33 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dyninst-fix-glibc-compatibility.patch base-commit: f6047c5b716e5d8f3d8a749f389954e4e4c36c16 diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 5d862b5df1..263c2909f3 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -18,6 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages instrumentation) + #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -178,7 +179,9 @@ (define-public dyninst (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m04pg824rqx647wvk9xl33ri8i6mm0vmrz9924li25dxbr4zqd5")))) + (base32 "1m04pg824rqx647wvk9xl33ri8i6mm0vmrz9924li25dxbr4zqd5")) + (patches + (search-patches "dyninst-fix-glibc-compatibility.patch")))) (build-system cmake-build-system) (arguments diff --git a/gnu/packages/patches/dyninst-fix-glibc-compatibility.patch b/gnu/packages/patches/dyninst-fix-glibc-compatibility.patch new file mode 100644 index 0000000000..cd018da6cc --- /dev/null +++ b/gnu/packages/patches/dyninst-fix-glibc-compatibility.patch @@ -0,0 +1,33 @@ +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 +