~ruther/guix-local

d11dcafc8464b2d34d96bea823ec1a92b2bf16f5 — Andreas Enge 7 months ago d5b489a
gnu: Remove llvm-3.6.

* gnu/packages/llvm.scm (llvm-3.6): Delete variable.
* gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister file.

Change-Id: Ideb23a850c9c4b3439d80eb1ed39a8485f3a3b07
3 files changed, 0 insertions(+), 27 deletions(-)

M gnu/local.mk
M gnu/packages/llvm.scm
D gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch
M gnu/local.mk => gnu/local.mk +0 -1
@@ 1829,7 1829,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/lirc-localstatedir.patch			\
  %D%/packages/patches/lirc-reproducible-build.patch		\
  %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch	\
  %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch	\
  %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch	\
  %D%/packages/patches/llvm-13-gcc-14.patch			\
  %D%/packages/patches/lm-sensors-hwmon-attrs.patch		\

M gnu/packages/llvm.scm => gnu/packages/llvm.scm +0 -13
@@ 1190,19 1190,6 @@ Library.")
                   #:legacy-build-shared-libs? #t
                   #:patches '("clang-3.5-libc-search-path.patch")))

(define-public llvm-3.6
  (package (inherit llvm-3.7)
    (version "3.6.2")
    (source
     (origin
       (method url-fetch)
       (uri (llvm-uri "llvm" version))
       (patches
        (search-patches "llvm-3.6-fix-build-with-gcc-10.patch"))
       (sha256
        (base32
         "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn"))))))

(define-public llvm-3.5
  (package (inherit llvm-3.7)
    (version "3.5.2")

D gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch => gnu/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch +0 -13
@@ 1,13 0,0 @@
Adapted from https://github.com/digego/extempore/pull/322/files

--- a/include/llvm/IR/ValueMap.h	2015-08-04 00:30:24.000000000 +0200
+++ b/include/llvm/IR/ValueMap.h	2018-07-14 21:09:09.769502736 +0200
@@ -99,7 +99,7 @@
   explicit ValueMap(const ExtraData &Data, unsigned NumInitBuckets = 64)
       : Map(NumInitBuckets), Data(Data) {}

-  bool hasMD() const { return MDMap; }
+  bool hasMD() const { return static_cast<bool>(MDMap); }
   MDMapT &MD() {
     if (!MDMap)
       MDMap.reset(new MDMapT);