From patchwork Mon Jul 8 09:59:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14521 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8B221171D4; Mon, 8 Jul 2019 11:02:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 38FCA171D2 for ; Mon, 8 Jul 2019 11:02:40 +0100 (BST) Received: from localhost ([::1]:40038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQTn-0006Ll-SG for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55033) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRZ-0005Uh-AX for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRX-0003EK-RM for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRX-0003Dz-Jj for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRX-0004vj-GO for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 22/31] gnu: cyrus-sasl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156257999918684 (code B ref 36477); Mon, 08 Jul 2019 10:00:19 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:59 +0000 Received: from localhost ([127.0.0.1]:57846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRC-0004rC-GV for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:58 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR2-0004nl-TJ for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:49 -0400 Received: by mail-wm1-f68.google.com with SMTP id g67so9514287wme.1 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9LH9zS5a1KC41UiH/vEdbYKoGaeZ5Nr/Ztw1P9bOcww=; b=g/iKlywxq2Ax1HExSC87KtX4XDyC8jhOE4gP3jp2ZPVBgsoryyUCW4aYVHWRGuTcwz xeD80TARCivTXyd3dz48Nh3LGIDBlgEOj8jAY1xYrOik1u06ZHYLLtOGHRgRPA9WUGwE 6lCz7dU5X74FcBAF1tg8UrTFBDWjp8S5r31zDSFzQp8z04VSs4gLYcsmIVF0pH8Eh4cw dhQrvrRumHGZ8zSDfuZFBK57ybGmHm8FxLGXYThW8/4OMK5ltzHj9k7UbSkfV46AhRVw fLdpPn77CRirkEnJ3CIgtOUVfF9iWpr4hiEcPvjYN4F4ZWxKbNSuP/7jfP7aSm1mIKf8 te3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9LH9zS5a1KC41UiH/vEdbYKoGaeZ5Nr/Ztw1P9bOcww=; b=dGfTsU1D8lZYZKfV/12fT3wuOEWkuOmAN89OyZ7MFWnf6OgqlRVaBXzcSwDwT3gOtH 8C5M4if19sT1yjuonaSANjn6QFOJnRLVIBpAMozBN18BbZmdg82VhN56J4+Y/Meu2HFP McdE4fxNHHN+4DMoq5CU8qmcvr48FsOeguCU6psEe9YUToDHmWzLTrYx45DNe+mBj0YJ AH1aAL8ojj6V/Qr1jHbcwfN2tFy4m4djAY/xxUI5UASgilgw9kb7V3NDf099kbEJ2Z2R L67gFXcRXCrd8uLdwkn/3dIPmYT8+5GwiXaP20fXG6O23vMxdN6ffT/f0y3sKO27VZyP 6DKw== X-Gm-Message-State: APjAAAWZkIMTv/ttLIALCJAV2RMVSvmziT8qm0Hvv8O1s3Nf371zNp8A Fzf/b+n2qSTVaBZkx/YBvJOaM8cF X-Google-Smtp-Source: APXvYqw/rZBinlFeP4Ra5+a4udGUeqA1UD+d1AhllXb0TWNG67NViXgZcjKeT5tbyqyyGr2kcN4BBQ== X-Received: by 2002:a1c:b457:: with SMTP id d84mr17172860wmf.153.1562579982875; Mon, 08 Jul 2019 02:59:42 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:42 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:04 +0200 Message-Id: <20190708095913.3460-23-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 +++++++++++++++-- .../patches/cyrus-sasl-ac-try-run-fix.patch | 12 ++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e22f8af3cc..d5cd00c0ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -740,6 +740,7 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ + %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-CVE-2019-12749.patch \ %D%/packages/patches/dealii-mpi-deprecations.patch \ diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index f84136e631..3e65a1faf6 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 ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; 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 0000000000..8662e812e9 --- /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