From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#33725] [PATCH] gnu: llvm-rtti: Remove it. Resent-Message-ID: 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> 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 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 -- 2.18.0