[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
28/45: gnu: apr: Add libxcrypt dependency.
From: |
guix-commits |
Subject: |
28/45: gnu: apr: Add libxcrypt dependency. |
Date: |
Sun, 18 Feb 2024 08:41:07 -0500 (EST) |
jpoiret pushed a commit to branch core-updates-glibc-2.39
in repository guix.
commit 7f245a7843a162ea76e560161d63283ffa50b2c6
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Fri Feb 2 19:03:55 2024 +0100
gnu: apr: Add libxcrypt dependency.
* gnu/packages/apr.scm (apr): Add libxcrypt dependency.
Change-Id: Ib43ea0e3933e0df27654638150f21b8f8f504512
---
gnu/packages/apr.scm | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm
index 3bd4d1ecce..b3bb1f80e3 100644
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -26,6 +26,7 @@
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages perl)
#:use-module (gnu packages xml)
#:use-module (gnu packages autotools))
@@ -51,16 +52,25 @@
;; Thus, build sequentially.
`(#:parallel-build? #f
#:parallel-tests? #f
- ,@(if (target-ppc32?)
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-sources
- (lambda* (#:key inputs native-inputs #:allow-other-keys)
- (invoke "patch" "-p1" "--force" "--input"
- (assoc-ref (or native-inputs inputs)
- "atomics-patch"))))))
- '())))
- (inputs (list perl libltdl))
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (target-ppc32?)
+ `((add-after 'unpack 'patch-sources
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (invoke "patch" "-p1" "--force" "--input"
+ (assoc-ref (or native-inputs inputs)
+ "atomics-patch")))))
+ '())
+ (add-after 'install 'patch-libxcrypt-reference
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (define out (assoc-ref outputs "out"))
+ (define libxcrypt
+ (dirname (search-input-file inputs "/lib/libcrypt.so.1")))
+ (substitute* (list (string-append out "/bin/apr-1-config")
+ (string-append out "/lib/pkgconfig/apr-1.pc"))
+ (("-lcrypt")
+ (string-append "-L" libxcrypt " -lcrypt"))))))))
+ (inputs (list perl libltdl libxcrypt))
(native-inputs
`(,@(if (target-ppc32?)
`(("atomics-patch"
- 36/45: gnu: python-natsort: Add en_US.UTF-8 locale for tests., (continued)
- 36/45: gnu: python-natsort: Add en_US.UTF-8 locale for tests., guix-commits, 2024/02/18
- 32/45: gnu: cyrus-sasl: Add libxcrypt dependency., guix-commits, 2024/02/18
- 31/45: gnu: cups-minimal: Add libxcrypt dependency., guix-commits, 2024/02/18
- 14/45: gnu: python: Add libxcrypt dependency., guix-commits, 2024/02/18
- 38/45: gnu: accountsservice: Add libxcrypt dependency., guix-commits, 2024/02/18
- 26/45: gnu: apr: Update to 1.7.4., guix-commits, 2024/02/18
- 44/45: gnu: ldb: Remove reference to crypt., guix-commits, 2024/02/18
- 45/45: gnu: slock: Add libxcrypt dependency., guix-commits, 2024/02/18
- 17/45: gnu: shadow: Add libxcrypt dependency., guix-commits, 2024/02/18
- 18/45: gnu: tcsh: Add libxcrypt dependency., guix-commits, 2024/02/18
- 28/45: gnu: apr: Add libxcrypt dependency.,
guix-commits <=
- 21/45: services: udev: Make udev-rule helper functions generic., guix-commits, 2024/02/18
- 37/45: gnu: cryptsetup: G-Expify static-library., guix-commits, 2024/02/18
- 09/45: gnu: ffmpeg: Fix builds., guix-commits, 2024/02/18
- 19/45: gnu: eudev: Update to 3.2.14., guix-commits, 2024/02/18
- 33/45: gnu: tdb: Add libxcrypt dependency., guix-commits, 2024/02/18
- 24/45: gnu: upower: Update to 1.90.2., guix-commits, 2024/02/18
- 16/45: gnu: elogind: Add libxcrypt dependency., guix-commits, 2024/02/18
- 20/45: services: udev: Rewrite udev-rule to use file->udev-rule., guix-commits, 2024/02/18
- 27/45: gnu: apr-util: Update to 1.6.3., guix-commits, 2024/02/18
- 41/45: gnu: sambda/pinned: Add libxcrypt dependency., guix-commits, 2024/02/18