From d199a4c7b4c4d3320ed59e96a382f4c577630360 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 15 Feb 2019 11:28:14 +0100
Subject: gnu: LLVM, Clang: Update to 7.0.1.

* gnu/packages/patches/clang-7.0-libc-search-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/llvm.scm (llvm, clang-runtime, clang): Update to 7.0.1.
(llvm-7.0.1): Remove variable.
(clang-from-llvm)[arguments]: Adjust phase to match Clang 7.
(llvm-6, clang-runtime-6, clang-6): New public variables.
* gnu/packages/dlang.scm (ldc)[native-inputs]: Change LLVM and CLANG to
LLVM-6.0 and CLANG-6.0.
* gnu/packages/gl.scm (mesa)[inputs]: Change from LLVM to LLVM-6.
---
 gnu/packages/gl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b673cbffe6..37b8fce7cb 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -257,7 +257,7 @@ (define-public mesa
         ("libxvmc" ,libxvmc)
         ,@(match (%current-system)
             ((or "x86_64-linux" "i686-linux")
-             `(("llvm" ,llvm)))
+             `(("llvm" ,llvm-6))) ;TODO: Change to LLVM in the next rebuild cycle.
             (_
              `()))
         ("makedepend" ,makedepend)
-- 
cgit v1.2.3


From e6a668ec7303a71f87e4c9354b1458e555058c63 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 20 Feb 2019 08:24:33 +0100
Subject: gnu: mesa: Update to 18.3.4.

* gnu/packages/gl.scm (mesa): Update to 18.3.4.
---
 gnu/packages/gl.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b673cbffe6..8a336a50f4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -221,7 +221,7 @@ (define libva-without-mesa
 (define-public mesa
   (package
     (name "mesa")
-    (version "18.3.1")
+    (version "18.3.4")
     (source
       (origin
         (method url-fetch)
@@ -233,7 +233,7 @@ (define-public mesa
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"))
+          "01xv03ah4l5lcfx015n3fg1620dh4nbbv6gmhh6zhdsx6sj4sc9j"))
         (patches
          (search-patches "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
-- 
cgit v1.2.3


From 64766d5cafd5cf19189ed274eb7e29ef784f90de Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 20 Feb 2019 17:04:39 +0100
Subject: gnu: mesa: Build against LLVM 7.

* gnu/packages/gl.scm (mesa)[inputs]: Change LLVM-6 to LLVM.
---
 gnu/packages/gl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index f04fbcf73b..8a336a50f4 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -257,7 +257,7 @@ (define-public mesa
         ("libxvmc" ,libxvmc)
         ,@(match (%current-system)
             ((or "x86_64-linux" "i686-linux")
-             `(("llvm" ,llvm-6))) ;TODO: Change to LLVM in the next rebuild cycle.
+             `(("llvm" ,llvm)))
             (_
              `()))
         ("makedepend" ,makedepend)
-- 
cgit v1.2.3