gnu: OpenLDAP: Remove cross-compilation workaround.

This is no longer required since the update to 2.4.49 in commit
090f33d676.

* gnu/packages/openldap.scm (openldap)[native-inputs]: Remove AUTOMAKE.
[arguments]: Remove 'fix-configure' phase.
This commit is contained in:
Marius Bakke 2020-02-03 20:10:01 +01:00
parent 4a0c71f9f7
commit fe994a0c32
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -87,9 +87,7 @@ (define-public openldap
("zlib" ,zlib)))
(native-inputs `(("libtool" ,libtool)
("groff" ,groff)
("bdb" ,bdb-5.3)
;; For up to date 'config.guess' and 'config.sub'.
("automake" ,automake)))
("bdb" ,bdb-5.3)))
(arguments
`(#:tests? #f
#:configure-flags
@ -102,20 +100,6 @@ (define-public openldap
#:make-flags '("STRIP=")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-configure
(lambda* (#:key inputs native-inputs #:allow-other-keys)
;; Replace outdated config.sub and config.guess:
(with-directory-excursion "build"
(for-each (lambda (file)
(install-file (string-append
(assoc-ref
(or native-inputs inputs) "automake")
"/share/automake-"
,(version-major+minor
(package-version automake))
"/" file) "."))
'("config.sub" "config.guess")))
#t))
,@(if (%current-target-system)
'((add-before 'configure 'fix-cross-gcc
(lambda* (#:key target #:allow-other-keys)