~ruther/guix-local

8d942405892b9c5fd2c455ef3a4218252aff31c4 — Andreas Enge 6 months ago 6ff714d
gnu: Remove llvm-3.8.

* gnu/packages/llvm.scm (llvm-3.8): Delete variable.
* gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister file.

Fixes: guix/guix#2101
Change-Id: I71cee0723420fb7f928c0d1c747a3bf4424fa344
3 files changed, 0 insertions(+), 43 deletions(-)

M gnu/local.mk
M gnu/packages/llvm.scm
D gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch
M gnu/local.mk => gnu/local.mk +0 -1
@@ 1805,7 1805,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/linux-pam-unix_chkpwd.patch		\
  %D%/packages/patches/lirc-localstatedir.patch			\
  %D%/packages/patches/lirc-reproducible-build.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		\
  %D%/packages/patches/lsh-fix-x11-forwarding.patch		\

M gnu/packages/llvm.scm => gnu/packages/llvm.scm +0 -27
@@ 1055,33 1055,6 @@ Library.")
           `(("config" ,config))
           '())))))

(define-public llvm-3.8
  (package (inherit llvm-6)
    (name "llvm")
    (version "3.8.1")
    (source
     (origin
      (method url-fetch)
      (uri (llvm-uri "llvm" version))
      (sha256
       (base32
        "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))
      (patches (search-patches "llvm-3.x.1-fix-build-with-gcc.patch"))))
    (outputs '("out"))
    (arguments
     (substitute-keyword-arguments (package-arguments llvm-6)
       ((#:phases phases)
        #~(modify-phases #$phases
            (add-before 'build 'shared-lib-workaround
              ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen
              ;; doesn't seem to get the correct rpath to be able to run
              ;; from the build directory.  Set LD_LIBRARY_PATH as a
              ;; workaround.
              (lambda _
                (setenv "LD_LIBRARY_PATH"
                        (string-append (getcwd) "/lib"))))
            (delete 'install-opt-viewer)))))))

(define-public llvm-16
  (make-llvm "16.0.6"))


D gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch => gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch +0 -15
@@ 1,15 0,0 @@
Patch from https://github.com/digego/extempore/issues/318

diff --git a/include/llvm/IR/ValueMap.h.orig b/include/llvm/IR/ValueMap.h
index ad518ac..d928f6a 100644
--- a/include/llvm/IR/ValueMap.h
+++ b/include/llvm/IR/ValueMap.h
@@ -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);