From f7e17166048526bd48acd0d05678fe4cbff170aa Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Sun, 14 Sep 2025 18:53:42 +0200 Subject: [PATCH] gnu: Remove libcxxabi-6. * gnu/packages/llvm.scm (libcxxabi-6): Delete variable. Change-Id: I5bfad857a489d4dd513a15aaec52668a0eeb3d81 --- gnu/packages/llvm.scm | 62 ------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 13ac2d5f4f1..44cf3f3aa36 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1685,68 +1685,6 @@ use with Clang, targeting C++11, C++14 and above.") (native-inputs (list clang-6 llvm-6)))) -(define-public libcxxabi-6 - (package - (name "libcxxabi") - (version "6.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g")))) - (build-system cmake-build-system) - (arguments - (list - #:configure-flags - #~(list (string-append "-DLIBCXXABI_LIBCXX_INCLUDES=" - #$(this-package-native-input "libcxx") - "/include") - "-DCMAKE_C_COMPILER=clang" - "-DCMAKE_CXX_COMPILER=clang++") - #:phases - #~(modify-phases (@ (guix build cmake-build-system) %standard-phases) - (add-after 'unpack 'chdir - (lambda _ (chdir "libcxxabi"))) - (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Hide GCC's C++ headers so that they do not interfere with - ;; the ones we are attempting to build. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (cons (string-append - (assoc-ref inputs "libcxx") "/include/c++/v1") - (delete (string-append gcc "/include/c++") - (string-split - (getenv "CPLUS_INCLUDE_PATH") - #\:))) - ":")) - (format - #true - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH"))))) - (add-after 'install 'install-headers - (lambda* (#:key outputs #:allow-other-keys) - (let ((include-dir (string-append - (assoc-ref outputs "out") "/include"))) - (install-file "../libcxxabi/include/__cxxabi_config.h" - include-dir) - (install-file "../libcxxabi/include/cxxabi.h" - include-dir))))))) - (native-inputs - (list clang-6 llvm-6 libcxx-6)) - (home-page "https://libcxxabi.llvm.org") - (synopsis "C++ standard library support") - (description - "This package provides an implementation of low level support for a -standard C++ library.") - (license license:expat))) - ;; WARNING: This package is a dependency of mesa. (define-public libclc (package