[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/15: gnu: mesa: Build against the regular LLVM package.
From: |
guix-commits |
Subject: |
14/15: gnu: mesa: Build against the regular LLVM package. |
Date: |
Tue, 4 Dec 2018 14:06:36 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 730a4728cc38799f9683bde5a0711ab10d42a9f8
Author: Marius Bakke <address@hidden>
Date: Tue Dec 4 17:38:22 2018 +0100
gnu: mesa: Build against the regular LLVM package.
* gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-WITHOUT-RTTI to LLVM.
* gnu/packages/llvm.scm (llvm-without-rtti): Remove variable.
---
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 3968e43..1bf53bc 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -257,8 +257,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 8a9d1d3..4be86f3 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
- branch staging updated (b07724a -> e8de4b1), guix-commits, 2018/12/04
- 01/15: gnu: libinput: Update to 1.12.3., guix-commits, 2018/12/04
- 02/15: gnu: libepoxy: Update to 1.5.3., guix-commits, 2018/12/04
- 04/15: gnu: gtk+: Update to 3.24.1., guix-commits, 2018/12/04
- 05/15: gnu: json-glib: Update to 1.4.4., guix-commits, 2018/12/04
- 06/15: gnu: imagemagick: Update to 6.9.10-15., guix-commits, 2018/12/04
- 09/15: gnu: OpenBLAS: Update to 0.3.4., guix-commits, 2018/12/04
- 14/15: gnu: mesa: Build against the regular LLVM package.,
guix-commits <=
- 15/15: gnu: meson: Update to 0.48.2, guix-commits, 2018/12/04
- 03/15: gnu: tzdata: Update to 2018g., guix-commits, 2018/12/04
- 07/15: gnu: lz4: Download sources from git., guix-commits, 2018/12/04
- 08/15: gnu: libsigc++: Update to 2.10.1., guix-commits, 2018/12/04
- 10/15: gnu: libva: Update to 2.3.0., guix-commits, 2018/12/04
- 12/15: gnu: eudev: Download using git., guix-commits, 2018/12/04
- 13/15: gnu: eudev: Update to 3.2.7., guix-commits, 2018/12/04
- 11/15: gnu: gstreamer: Update to 1.14.4., guix-commits, 2018/12/04