From patchwork Thu Dec 13 13:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 462 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 D2C0A1693D; Thu, 13 Dec 2018 13:12:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id 5F7DB16879 for ; Thu, 13 Dec 2018 13:12:02 +0000 (GMT) Received: from localhost ([::1]:52397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXQmX-0004lo-T8 for patchwork@mira.cbaines.net; Thu, 13 Dec 2018 08:12:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXQbv-00034d-D6 for guix-patches@gnu.org; Thu, 13 Dec 2018 08:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXQbu-0007fD-Gp for guix-patches@gnu.org; Thu, 13 Dec 2018 08:01:03 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:41660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXQbu-0007f7-BQ for guix-patches@gnu.org; Thu, 13 Dec 2018 08:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gXQbu-0005s2-8Q for guix-patches@gnu.org; Thu, 13 Dec 2018 08:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33725] [PATCH] gnu: llvm-rtti: Remove it. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Dec 2018 13:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33725@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154470603922522 (code B ref -1); Thu, 13 Dec 2018 13:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2018 13:00:39 +0000 Received: from localhost ([127.0.0.1]:45918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gXQbX-0005rC-2i for submit@debbugs.gnu.org; Thu, 13 Dec 2018 08:00:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gXQbV-0005qy-CQ for submit@debbugs.gnu.org; Thu, 13 Dec 2018 08:00:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXQbH-0006uv-Mu for submit@debbugs.gnu.org; Thu, 13 Dec 2018 08:00:30 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:51044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXQbE-0006tM-6k for submit@debbugs.gnu.org; Thu, 13 Dec 2018 08:00:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXQb9-0002Vs-C5 for guix-patches@gnu.org; Thu, 13 Dec 2018 08:00:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXQb7-0006fh-Di for guix-patches@gnu.org; Thu, 13 Dec 2018 08:00:15 -0500 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:57620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXQb6-0006eD-Vq for guix-patches@gnu.org; Thu, 13 Dec 2018 08:00:13 -0500 Received: from localhost (unknown [IPv6:2a00:8c40:243:232:e578:c72a:a557:a8f1]) by mira.cbaines.net (Postfix) with ESMTPSA id 2BA3616879 for ; Thu, 13 Dec 2018 13:00:12 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 9edce8d6 for ; Thu, 13 Dec 2018 13:00:11 +0000 (UTC) From: Christopher Baines Date: Thu, 13 Dec 2018 14:00:11 +0100 Message-Id: <20181213130011.21616-1-mail@cbaines.net> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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" X-getmail-retrieved-from-mailbox: Patches This reverts commit f8cba3ff4fc6aed0c539700aa47b6e8f4c25c34d. It sounds from the comment that this can hopefully be removed now. * gnu/packages/llvm.scm (llvm-without-rtti): Remove it. * gnu/packages/gl.scm (mesa)[inputs]: Switch to using llvm rather than llvm-without-rtti. --- gnu/packages/gl.scm | 3 +-- gnu/packages/llvm.scm | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d7c112928f..5313a74e5c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -255,8 +255,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - ;; FIXME: Change to 'llvm' in the next rebuild cycle. - `(("llvm" ,llvm-without-rtti))) + `(("llvm" ,llvm))) (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8a9d1d312b..4be86f3d21 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -95,26 +95,6 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) -;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 -;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of -;; this in the next rebuild cycle. -(define-public llvm-without-rtti - (package - (inherit llvm) - (arguments - `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_ENABLE_FFI:BOOL=TRUE" - "-DLLVM_INSTALL_UTILS=ON") - #:build-type "Release" - #:phases (modify-phases %standard-phases - (add-before 'build 'shared-lib-workaround - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")) - #t))))))) - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package