diff options
| author | Andreas Enge <andreas@enge.fr> | 2025-09-14 18:47:43 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-09-14 18:47:43 +0200 |
| commit | e75d129fa5dd2a9695d4e3bcbddd229a94887abb (patch) | |
| tree | fde1e162dcfeb3ddb042930e3f9e124e1277f04f /gnu/packages/compression.scm | |
| parent | 089c22c273964ba1b8c4b8e9a528ee828aa65c5f (diff) | |
gnu: Remove snappy-with-clang6.
* gnu/packages/compression.scm (snappy-with-clang6): Delete variable.
Change-Id: Ia3a3e534acf77ebf6edea3f2f9482c4e96ac1e38
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 974aa149820..cb3eb84aa59 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm | |||
| @@ -1461,53 +1461,6 @@ for most inputs, but the resulting compressed files are anywhere from 20% to | |||
| 1461 | (license license:asl2.0) | 1461 | (license license:asl2.0) |
| 1462 | (properties '((cpe-vendor . "google"))))) | 1462 | (properties '((cpe-vendor . "google"))))) |
| 1463 | 1463 | ||
| 1464 | ;; We need this for irods. | ||
| 1465 | (define-public snappy-with-clang6 | ||
| 1466 | (package | ||
| 1467 | (inherit snappy) | ||
| 1468 | (name "snappy-with-clang") | ||
| 1469 | ;; XXX 1.1.9 fails to build with clang with | ||
| 1470 | ;; error: invalid output constraint '=@ccz' in asm | ||
| 1471 | (version "1.1.8") | ||
| 1472 | (source | ||
| 1473 | (origin | ||
| 1474 | (method git-fetch) | ||
| 1475 | (uri (git-reference | ||
| 1476 | (url "https://github.com/google/snappy") | ||
| 1477 | (commit version))) | ||
| 1478 | (file-name (git-file-name name version)) | ||
| 1479 | (sha256 | ||
| 1480 | (base32 "1j0kslq2dvxgkcxl1gakhvsa731yrcvcaipcp5k8k7ayicvkv9jv")))) | ||
| 1481 | (arguments | ||
| 1482 | `(#:configure-flags | ||
| 1483 | '("-DBUILD_SHARED_LIBS=ON" | ||
| 1484 | "-DCMAKE_CXX_COMPILER=clang++" | ||
| 1485 | "-DCMAKE_CXX_FLAGS=-stdlib=libc++" | ||
| 1486 | "-DCMAKE_EXE_LINKER_FLAGS=-lc++abi") | ||
| 1487 | #:phases | ||
| 1488 | (modify-phases %standard-phases | ||
| 1489 | (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH | ||
| 1490 | (lambda* (#:key native-inputs inputs #:allow-other-keys) | ||
| 1491 | (let ((gcc (assoc-ref (or native-inputs inputs) "gcc"))) | ||
| 1492 | (setenv "CPLUS_INCLUDE_PATH" | ||
| 1493 | (string-join | ||
| 1494 | (cons* (search-input-directory inputs | ||
| 1495 | "/include/c++/v1") | ||
| 1496 | ;; Hide GCC's C++ headers so that they do not interfere with | ||
| 1497 | ;; the Clang headers. | ||
| 1498 | (delete (string-append gcc "/include/c++") | ||
| 1499 | (string-split (getenv "CPLUS_INCLUDE_PATH") | ||
| 1500 | #\:))) | ||
| 1501 | ":")) | ||
| 1502 | (format #true | ||
| 1503 | "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" | ||
| 1504 | (getenv "CPLUS_INCLUDE_PATH")))))))) | ||
| 1505 | (properties `((hidden? . #true))) | ||
| 1506 | (native-inputs | ||
| 1507 | `(("clang" ,clang-toolchain-6))) | ||
| 1508 | (inputs | ||
| 1509 | (list libcxx+libcxxabi-6 libcxxabi-6)))) | ||
| 1510 | |||
| 1511 | (define-public p7zip | 1464 | (define-public p7zip |
| 1512 | (package | 1465 | (package |
| 1513 | (name "p7zip") | 1466 | (name "p7zip") |
