From 8d942405892b9c5fd2c455ef3a4218252aff31c4 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 19 Sep 2025 21:39:55 +0200 Subject: [PATCH] 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 --- gnu/local.mk | 1 - gnu/packages/llvm.scm | 27 ------------------- .../llvm-3.x.1-fix-build-with-gcc.patch | 15 ----------- 3 files changed, 43 deletions(-) delete mode 100644 gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2e6e551838..f4527466e51 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 2425c0924e5..f3ca81a3b09 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -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")) diff --git a/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch b/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch deleted file mode 100644 index 75236c4069d..00000000000 --- a/gnu/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch +++ /dev/null @@ -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(MDMap); } - MDMapT &MD() { - if (!MDMap) - MDMap.reset(new MDMapT);