From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mDxMFsLbeGFgbgAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 06:55:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YLzvEcLbeGGidQAAbx9fmQ (envelope-from ) for ; Wed, 27 Oct 2021 04:55:30 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 294578F13 for ; Wed, 27 Oct 2021 06:55:30 +0200 (CEST) Received: from localhost ([::1]:39634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfayH-0003fU-Bu for larch@yhetil.org; Wed, 27 Oct 2021 00:55:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfawy-0001wd-05 for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawx-0003p3-NY for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawx-00059t-Ma for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 14/20] gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041719656 (code B ref 51428); Wed, 27 Oct 2021 04:54:07 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:37 +0000 Received: from localhost ([127.0.0.1]:48144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawS-00056r-R8 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:37 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:42535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw8-00053u-Qt for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:17 -0400 Received: by mail-qk1-f171.google.com with SMTP id y10so1319605qkp.9 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pt2av54PseXsomEjvloGpkVk5wflk4NTxTnJvWPvOd0=; b=K83ZVu4Fl8omlf7o+CGa40nPJjeU9zn+SAFex7HmSZo3mdS98gIKApwbpJqxBuFhAy PogtHzAFhB/4U6Y2UfFykYw1rch2MzBVZJOS7+Rp6aguhD/wkyFlaqGvMrvy0Cd5lYpq FDXVyucDk7Bm4lwWEyKgGrHRk/A0+ciGjZBsjqoeSmnGOGFbrLfqraXvy2M9Fc2uZ0VR Zd8dtdR8NQbqp1uVCEtV1uKM/ixvux9qd0T257LbN1YF/pqBwwxBceQUBOJVjBKRnlup c31CXGzmp7RhaYY3f7aWCF2L87sFCcRX06FYIoidFKbnwbWhmi6qru5dRRh/rXdcD8aO PyYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pt2av54PseXsomEjvloGpkVk5wflk4NTxTnJvWPvOd0=; b=LDWfQS3Z3o0E2WpL9t+Em0rErYpMITzCRTbsblYPQIbhBU6iSDOrXzZsZGF6seLzFk myLS0GuXxm0U4OlUlOJHiS7lMUlppa8ytm/r3x4xksb/Ly65qw3zmS0yZzHkBCxFsrTw HLRpB+8P26EGwNzmpNnYULnJMXdtvH1bHOJIB4zUctGuZOzi3aWRnZ8X69XLqqaOwcdm bs8vx2Ha61aHQauKJl0saI86vqN8fSQjfIdkkzriob6w/1uhqseTxZ8rtbph3msfBy+g HTULRiJaP5nbbbPxV1eizPOrOTpApBuj71T9Zb3YIXAs3s+xE72jD64KzCqr/YqUqdc2 HADQ== X-Gm-Message-State: AOAM5332Cbt5huk7EIrzEnfdOQXIzMQVfs8gQp30QrwnGCUBCAVFTt6Y UZdz3iMsJ7SkNVbcVp12eI1RGarE0aw= X-Google-Smtp-Source: ABdhPJyiseC9MHJg3wVvFWwYgDb9H8nZ5To3upQv71F7tcevhwGTBkKfVk5Pf+GA4Hv768oW7wveOg== X-Received: by 2002:ae9:de07:: with SMTP id s7mr22402947qkf.47.1635310391188; Tue, 26 Oct 2021 21:53:11 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:10 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:45 -0400 Message-Id: <20211027045151.9889-14-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635310530; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=pt2av54PseXsomEjvloGpkVk5wflk4NTxTnJvWPvOd0=; b=S2zhcN9EIE5wzcvX7W4ihPab5xxrRSmR9ZeLQKurQnhH93bHmNR1vh8FTFpK/RQcobCPth PX7CjWkASgnh3xS4h6D2s5pmuM6NhK/cC/KWKf/TY290IA8Q2Rv1rD1O6tmTOK3UHn0/f9 KDpq5gThwRaUF0HK9mAzd+pCF+mwqzmJIFv0lBRP8bHR0bEpGfCQzTN5n0aVzu1SMTXPen gWiKYQi24BhNhAXYqpGHyWaxN8B8ZnRTgCisoeyk2n2l6hh7sz+pe77anYHWgikpUPvHPI xHaSetqPrXvYJdTex5we5oS7Kx7S4xN0Ffi1f9Bfz8sOIlCBiqwX2gMfJJ5DLg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635310530; a=rsa-sha256; cv=none; b=Nxgb/ww8uavOtaaoKjxOGw9ZRHMvlwp2yy5SPbBFn98UruPkPkTtORM+mQ3GIRoI86aw2o pCZerhZrg0/inpLw4IrS2uZEGL+PcLrw9GyEzKELE5hlqjrbjRNTQ64OcFVtw1dwjD+wDp xRNcnJBrzE5GYs15oQXTKC6QfM9m3P4K8m1ViZU/2Y4CEAAiz04ctBkkwiWW4k+/7RW6UJ G58uZp59N2UStKIGSzYGAilObzT26EktqSHS+n0uxzDv++AlGB6Y+HbdA5tzUAQv4q/ci5 o/2Z5w84oBnRvARvSWgtdC8jROfoqPRVE+zIYqEnuTPs+mRBf3kBUhwjDccCAA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=K83ZVu4F; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=K83ZVu4F; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 294578F13 X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: HTtHKUio44CK * gnu/packages/chromium.scm (make-lld-wrapper): Delete procedure. (ungoogled-chromium)[native-inputs]: Replace its use by lld-as-ld-wrapper. --- gnu/packages/chromium.scm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 534b9a4ad9..2d67182e22 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -460,31 +460,6 @@ (define opus+custom `(cons "--enable-custom-modes" ,flags)))))) -;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need -;; this trick to make it wrap 'lld'. -(define (make-lld-wrapper lld) - (define lld-as-ld - (computed-file "lld-ld" - #~(begin - (mkdir #$output) - (mkdir (string-append #$output "/bin")) - (symlink #$(file-append lld "/bin/lld") - (string-append #$output "/bin/ld"))))) - - ;; Create a wrapper for LLD that inserts appropriate -rpath entries. - (define lld-wrapper - (make-ld-wrapper "lld-wrapper" - #:binutils lld-as-ld)) - - ;; Clang looks for an 'ld.lld' executable, so we need to symlink it back. - (computed-file "lld-wrapped" - #~(begin - (mkdir #$output) - (mkdir (string-append #$output "/bin")) - (symlink #$(file-append lld-wrapper "/bin/ld") - (string-append #$output "/bin/lld")) - (symlink "lld" (string-append #$output "/bin/ld.lld"))))) - (define-public ungoogled-chromium (package (name "ungoogled-chromium") @@ -848,7 +823,7 @@ (define-public ungoogled-chromium ("clang" ,clang-12) ("gn" ,gn) ("gperf" ,gperf) - ("ld-wrapper" ,(make-lld-wrapper lld)) + ("ld-wrapper" ,lld-as-ld-wrapper) ("ninja" ,ninja) ("node" ,node-lts) ("pkg-config" ,pkg-config) -- 2.33.1