diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2024-02-02 19:03:55 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:52 +0200 |
| commit | 5eca35f7ebd4b892049f702c64c4971863c330e2 (patch) | |
| tree | abf5abcf69452568467b2cee1b1776259c85b7fd /gnu/packages | |
| parent | 45f99a1e6a1a0d3f57cda9d05ef1f0835f40b0ab (diff) | |
| download | guix-5eca35f7ebd4b892049f702c64c4971863c330e2.tar.gz | |
gnu: apr: Add libxcrypt dependency.
* gnu/packages/apr.scm (apr): Add libxcrypt dependency. Change-Id: Ib43ea0e3933e0df27654638150f21b8f8f504512
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/apr.scm | 30 |
1 files 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" |