[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
22/64: gnu: cyrus-sasl: Fix cross-compilation.
From: |
guix-commits |
Subject: |
22/64: gnu: cyrus-sasl: Fix cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:18 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit bbfba48f4bcb4e30794548ae85928d09c50c0a9c
Author: Mathieu Othacehe <address@hidden>
Date: Fri Jul 5 10:34:13 2019 +0200
gnu: cyrus-sasl: Fix cross-compilation.
* gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[origin]: Apply it.
[native-tools]: Add autoconf, automake and libtool.
[arguments]: Run autoconf to apply m4 modification in patch above.
---
gnu/local.mk | 1 +
gnu/packages/cyrus-sasl.scm | 17 +++++++++++++++--
gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch | 12 ++++++++++++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index de0170e..74f09ba 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -750,6 +750,7 @@ dist_patch_DATA =
\
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-CVE-2017-12836.patch \
+ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \
%D%/packages/patches/darkice-workaround-fpermissive-error.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index f84136e..3e65a1f 100644
--- a/gnu/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2013 Andreas Enge <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -20,6 +21,7 @@
(define-module (gnu packages cyrus-sasl)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages dbm)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages tls)
@@ -41,8 +43,13 @@
"ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-"
version ".tar.gz")))
(sha256 (base32
- "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"))))
+ "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"))
+ (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
(inputs `(("gdbm" ,gdbm)
("openssl" ,openssl)))
(propagated-inputs
@@ -57,7 +64,13 @@
;; 'plugin_common.c'. When building the shared libraries there, libtool
;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can
;; fail with EEXIST when building things in parallel.
- #:parallel-build? #f))
+ #:parallel-build? #f
+
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autogen
+ (lambda _
+ (invoke "autoreconf" "-vif"))))))
(synopsis "Simple Authentication Security Layer implementation")
(description
"SASL (Simple Authentication Security Layer) is an Internet
diff --git a/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch
b/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch
new file mode 100644
index 0000000..8662e81
--- /dev/null
+++ b/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch
@@ -0,0 +1,12 @@
+--- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300
++++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300
+@@ -339,7 +339,8 @@
+ ],
+ [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation
supports SPNEGO])
+ AC_MSG_RESULT(yes) ],
+- AC_MSG_RESULT(no))
++ AC_MSG_RESULT(no),
++ AC_MSG_RESULT(no))
+ LIBS="$cmu_save_LIBS"
+
+ else
- 06/64: gnu: xorg: Fix cross-compilation of multiple packages., (continued)
- 06/64: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/08/23
- 04/64: gnu: tk: Fix cross-compilation., guix-commits, 2019/08/23
- 01/64: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/23
- 02/64: gnu: python: Fix cross compilation., guix-commits, 2019/08/23
- 07/64: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/08/23
- 17/64: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/08/23
- 19/64: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 26/64: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/08/23
- 20/64: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 25/64: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/08/23
- 22/64: gnu: cyrus-sasl: Fix cross-compilation.,
guix-commits <=
- 29/64: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/08/23
- 31/64: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/08/23
- 41/64: gnu: procps: Fix cross-compilation., guix-commits, 2019/08/23
- 45/64: gnu: libtool: Fix cross-compilation., guix-commits, 2019/08/23
- 47/64: packages: Set outputs field as thunked., guix-commits, 2019/08/23
- 44/64: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/23
- 05/64: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/08/23
- 03/64: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/23
- 09/64: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/23
- 10/64: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/23