From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id oEHYJ3dwNmVm+QAAG6o9tA:P1 (envelope-from ) for ; Mon, 23 Oct 2023 15:09:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oEHYJ3dwNmVm+QAAG6o9tA (envelope-from ) for ; Mon, 23 Oct 2023 15:09:11 +0200 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 8C5A93F575 for ; Mon, 23 Oct 2023 15:09:11 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=dqOWzqM6; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698066551; a=rsa-sha256; cv=none; b=Kx4jdYwBrR18x4RgLSZpBKxiYU2Tev04BZTqNSHtkij13c08s+ZSpbjfyX7wE7o1PVdnKb X4xIliM151KjInbqAlGGJbiNTVgbLL13fuRgI2l2GnjrVL9TsQb56j7GYsIEMRVs5WAVRY r2TJO4RFqjGAfBpylpT5r4ofK+mvPacwDCzp6rYVyNMhsVuWp95NieKD4Y6BC5B6jmCgpn D/klf+vf/m7ECi6jvl/imUllov91NNKDTvu7/oqZ4gTZO9di77yMMUY6JnDNZtfDW2C9/U v+P9iBu55lsvHwtFS3htThgEEUk/XfTebEBTkxgyhQzz34kXg2y2xNxK5Gy0uA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=dqOWzqM6; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698066551; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=ty7G8JkYWufVefkHe7kclbbd+JgAr8KFxvWFpt4SVuw=; b=aINh3UBEyWwymoKrwjFFuz0um8xvYjHkAdDBay5JD8lPABRUGor4fFSjGUO/QFgT8K2kBB w90whEZZvKfBXnEpImvJRUdxpWl4GMim8gv6l/dqebKr5ggbWGmWb8taRpla3aMQSuLnhf siFyFcW+4Zati+tMVrO+6B8G7ae6ofpefHQ8nvPZKxs7Yw6Tlt8u6j7wM1wZ7TTFYxc6Xq guqtSb+CFEp4x4Rp42qQTjIkCiVIx1/tiCHiLzcivHZQSTJcqkrXd6am1diBI4y5iFMPk8 xxJFXjuliciP838Il3dU5msiuYJ0fZThY5u6dtTNiIkH1s143BfD4h0P+eRgZg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quuCs-0003JS-UM; Mon, 23 Oct 2023 08:38:55 -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 1quuCY-0003DV-Cy for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:35 -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 1quuCX-0001MY-T7 for guix-patches@gnu.org; Mon, 23 Oct 2023 08:38:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quuD0-0007U3-Du; Mon, 23 Oct 2023 08:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66701] [PATCH 01/14] gnu: clang-runtime-from-llvm: Adjust inputs for version 15 or later. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 12:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66701 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66701@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 66701-submit@debbugs.gnu.org id=B66701.169806472128703 (code B ref 66701); Mon, 23 Oct 2023 12:39:02 +0000 Received: (at 66701) by debbugs.gnu.org; 23 Oct 2023 12:38:41 +0000 Received: from localhost ([127.0.0.1]:49338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCf-0007St-AR for submit@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quuCa-0007SW-IF for 66701@debbugs.gnu.org; Mon, 23 Oct 2023 08:38:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698064531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ty7G8JkYWufVefkHe7kclbbd+JgAr8KFxvWFpt4SVuw=; b=dqOWzqM6X/eJ1Fl0k/NfGcrLkcl7dozDxXhUXKh4gzjrJN+NJqkOaYsezXJ9ofVmY6fbmY Gq7WoInIQ7NOHNNMVL2FJ5kog89RC9XVQxqgWlpW3eQD57WMe93N6HkgWhxIge1w/AScfI bs+RkZNaL58W4ajCYXsco+M+TjZjrm3+smK0JVjONULr7N/2Z2nASU9oMnQ46/+R/na0PQ Jzm8RXcoWegR60QbKYmXYSjPN81TZW3gXHVxvjl1XVPZSENt+m1mn0E78RxSl1LDnuxacH zjE7j4ukz/ErcneUFw5Z1XSGw/Wp1dpSaIjPT0NeiGvpDPC5QApiQmPEpOfGrA== Date: Mon, 23 Oct 2023 20:36:09 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -6.63 X-Spam-Score: -6.63 X-Migadu-Queue-Id: 8C5A93F575 X-TUID: b7SMeFAAMv8Z * gnu/packages/llvm.scm (clang-runtime-from-llvm)[native-inputs]: Add gcc-12 when version >= 15. [inputs]: Add libffi when version >= 15. (clang-runtime-15)[native-inputs,inputs]: Remove fields. Change-Id: I4b385b937edbb7a2840b998b6dd3e31a17cb556f --- gnu/packages/llvm.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index cd551f4e02..38c4047f48 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Clément Lassieur ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2023 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,9 +140,19 @@ (define* (clang-runtime-from-llvm llvm (patches (map search-patch patches))) (llvm-monorepo (package-version llvm)))) (build-system cmake-build-system) - (native-inputs (package-native-inputs llvm)) + (native-inputs + (if (version>=? version "15") + ;; TODO: Remove this when GCC 12 is the default. + ;; libfuzzer fails to build with GCC 11 + (modify-inputs (package-native-inputs llvm) + (prepend gcc-12)) + (package-native-inputs llvm))) (inputs - (list llvm)) + (append + (list llvm) + (if (version>=? version "15") + (list libffi) + '()))) (arguments `(;; Don't use '-g' during the build to save space. #:build-type "Release" @@ -712,13 +723,7 @@ (define-public clang-runtime-15 #~(modify-phases #$phases (add-after 'unpack 'change-directory (lambda _ - (chdir "compiler-rt"))))))) - (native-inputs - (modify-inputs (package-native-inputs template) - (prepend gcc-12))) ;libfuzzer fails to build with GCC 11 - (inputs - (modify-inputs (package-inputs template) - (append libffi)))))) + (chdir "compiler-rt")))))))))) (define-public clang-runtime-14 (let ((template (clang-runtime-from-llvm llvm-14))) -- 2.41.0