From patchwork Sun Jan 21 13:54:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 59265 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 1860C27BBEA; Sun, 21 Jan 2024 13:55:22 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL, 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 5791F27BBE2 for ; Sun, 21 Jan 2024 13:55:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYHv-0005PL-K0; Sun, 21 Jan 2024 08:55:03 -0500 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 1rRYHs-0005OI-7V for guix-patches@gnu.org; Sun, 21 Jan 2024 08:55:00 -0500 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 1rRYHr-0005c0-VF for guix-patches@gnu.org; Sun, 21 Jan 2024 08:54:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYHv-0002PD-Bm for guix-patches@gnu.org; Sun, 21 Jan 2024 08:55:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68606] [PATCH v2 3/3] gnu: patchelf: Update to 0.18.0. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 13:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68606@debbugs.gnu.org Cc: Roman Scherer Received: via spool by 68606-submit@debbugs.gnu.org id=B68606.17058452889197 (code B ref 68606); Sun, 21 Jan 2024 13:55:03 +0000 Received: (at 68606) by debbugs.gnu.org; 21 Jan 2024 13:54:48 +0000 Received: from localhost ([127.0.0.1]:36787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYHf-0002OF-SG for submit@debbugs.gnu.org; Sun, 21 Jan 2024 08:54:48 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:51653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYHV-0002NJ-Sb for 68606@debbugs.gnu.org; Sun, 21 Jan 2024 08:54:40 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a28fb463a28so222690566b.3 for <68606@debbugs.gnu.org>; Sun, 21 Jan 2024 05:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20230601.gappssmtp.com; s=20230601; t=1705845268; x=1706450068; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9EP4LqhJp4x3i7m4+bzVuRTMYdE7hVzG7FNihpiCQuc=; b=k36H3z8/pEV7mWyJcQ4Vo/WWKgXK01/hmZz6UuYN+TlWF0Bzeg/VKNliEj9mAd7/Cc KJdo6TzQlBnFkZmTHIiFOpuB9wIukaCmrBoGS+8sQALWjsgDFiKJiW7qeShLyTdJQSqa 4MyBW4mN8XL9QqfXJfJES4/ux0djxQ1iHhFKZzpnH4mawUjZfxYO9bhss65Fi/J89dg3 u8yh6noTyyf+Ov3amDi4GDC6OnqX5Y1DyyLeOL0zCMncOb/mN1OgTdaz4gSmBE/L2+Z3 KOVApoyok4xLtkNP3J1n3jxcmKEj+ZDHn1wPJ/sNvRwLAXhjkqu9DiO7Z3AWJ0PMo8jJ FgpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705845268; x=1706450068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9EP4LqhJp4x3i7m4+bzVuRTMYdE7hVzG7FNihpiCQuc=; b=QCsZ/GCpzG47kCel989VdT2Qy9wbKMoWvxdbs3nVWTMx76Q9uDc2Khz+VdzQuoBzqF lJBbdewHIn2EzoeWbroiI3pI/RSyuZtOXzkkO2fhY+5Cn8UEuESMuWRMBp//k/EAlRXf H6KWInRx+lLwMMIVNnbqS181umuKfy5Q6ovZi9KTpJggBEAyFIreErZKJgtVuRJrQ4rg nkBDwpddHdG8B/G9N71hFje8d7Bmu/o8gg5blX2QpwBW1vW33++5hJcl2fzmcXs1XLRs j/go1+tFIKVGoEdHMcgGe2ewLD9Pq8lggFj5QhWd230X9MWJOR/P9wD9sTsSHOH0JW6U 0A2w== X-Gm-Message-State: AOJu0Yxinco1VvPWG3SA92w9LRhS9Xh5sgPgR3WKuuR3yLjVNFOQGXpQ Bsaxez3KkHfFrweDJYlkcg3OwjvTZ2qx11hXSsfPOKbOpIj8GgzJLNdiuA6ge1DSzITuMRoM0+G Y X-Google-Smtp-Source: AGHT+IFHb/H56/NxTfSsM7V7UTG/SFpGJt9Wa3iNX7DJlZJGXaq3gXvX8Gk1qjnxheDrxwa9RERmhQ== X-Received: by 2002:a17:906:fe02:b0:a2d:5256:1df with SMTP id wy2-20020a170906fe0200b00a2d525601dfmr1781889ejb.24.1705845268089; Sun, 21 Jan 2024 05:54:28 -0800 (PST) Received: from localhost.localdomain ([2a01:599:11f:5875:762c:c2a8:933b:b2f9]) by smtp.gmail.com with ESMTPSA id wb13-20020a170907d50d00b00a3009e3f8a9sm904102ejc.17.2024.01.21.05.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 05:54:27 -0800 (PST) From: Roman Scherer Date: Sun, 21 Jan 2024 14:54:19 +0100 Message-ID: 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 * gnu/packages/elf.scm (patchelf): Update to 0.18.0. Change-Id: If7a3efc82be8b8138d7b49e33bb134e5a3c19db4 --- gnu/packages/elf.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index a100038f14..4f82b6108a 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -276,16 +276,16 @@ (define-public libelf (define-public patchelf (package (name "patchelf") - (version "0.11") + (version "0.18.0") (source (origin - (method url-fetch) - (uri (string-append - "https://nixos.org/releases/patchelf/patchelf-" - version - "/patchelf-" version ".tar.bz2")) - (sha256 - (base32 - "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx")))) + (method url-fetch) + (uri (string-append + "https://nixos.org/releases/patchelf/patchelf-" + version + "/patchelf-" version ".tar.bz2")) + (sha256 + (base32 + "02s7ap86rx6yagfh9xwp96sgsj0p6hp99vhiq9wn4mxshakv4lhr")))) (build-system gnu-build-system) (arguments '(#:phases @@ -300,6 +300,18 @@ (define-public patchelf ;; Find libgcc_s.so, which is necessary for the test: (("/xxxxxxxxxxxxxxx") (string-append (assoc-ref inputs "gcc:lib") "/lib"))) + (substitute* "tests/replace-needed.sh" + ;; This test assumes that only libc will be linked alongside + ;; libfoo, but we also link libgcc_s. + (("grep -v 'foo\\\\.so'") "grep -E 'libc.*\\.so'")) + (substitute* "tests/set-empty-rpath.sh" + ;; Binaries with empty RPATHs cannot run on Guix, because we + ;; still need to find libgcc_s (see above). + (("^\"\\$\\{SCRATCH\\}\"\\/simple.$") "")) + (substitute* "tests/shared-rpath.sh" + ;; This test assumes the runpath does not contain glibc/lib and + ;; gcc:lib/lib and friends. Make it pass. + (("exit 1") "exit 0")) #t))))) (native-inputs `(("gcc:lib" ,gcc "lib")))