From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXR33-00086s-Kk for guix-patches@gnu.org; Thu, 13 Dec 2018 08:29:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXR31-0004t9-0L for guix-patches@gnu.org; Thu, 13 Dec 2018 08:29:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:41679) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXR30-0004p9-PO for guix-patches@gnu.org; Thu, 13 Dec 2018 08:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gXR30-0006cw-Bo for guix-patches@gnu.org; Thu, 13 Dec 2018 08:29:02 -0500 Subject: [bug#33725] [PATCH v2] gnu: llvm-rtti: Remove it. Resent-Message-ID: From: Christopher Baines Date: Thu, 13 Dec 2018 14:28:32 +0100 Message-Id: <20181213132832.24877-1-mail@cbaines.net> In-Reply-To: <20181213130011.21616-1-mail@cbaines.net> References: <20181213130011.21616-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33725@debbugs.gnu.org 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 7eb785c364..ec79bcc95c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -110,26 +110,6 @@ of programming tools as well as libraries with equivalent functionality.") (base32 "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb")))))) -;; 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 -- 2.18.0