From patchwork Wed Aug 21 08:54:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15092 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 23BFB17264; Wed, 21 Aug 2019 10:00:27 +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 C5D2E1724B for ; Wed, 21 Aug 2019 10:00:26 +0100 (BST) Received: from localhost ([::1]:45720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTh-0003TV-Pb for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPh-0006oM-9f for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPf-0005LB-Rs for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54094) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPf-0005L0-Ov for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPf-0006a7-JM for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 22/61] gnu: cyrus-sasl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:15 +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.156637775425016 (code B ref 36477); Wed, 21 Aug 2019 08:56:15 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:54 +0000 Received: from localhost ([127.0.0.1]:34630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPJ-0006VE-C6 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:53 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOq-0006PR-EB for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:24 -0400 Received: by mail-wm1-f66.google.com with SMTP id 10so1267673wmp.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:24 -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=KkT1K4V0Sv2ZMoakBnb3DurRc6mK7Xt3/G9M48Xo3ok=; b=uysokTu1eRrUdskawCcCdzNQrOO86hBOPo/HeAMuTKmTC5w+9Qr88likfpYv/e6C6F cEGG4LGFd4clUN6Xdopxb2XhtDjq5lWVyUqA4xyqQyWcQK9R3Wr6WSMR7UFakRhXduv9 E9mmkiFAeOY9zpB1AgQssFxHGJ+zNo6dIn55yQELCuNhi8E+K2WZDTucyldAkQ+Sz9IF FIvDW8JjZaZaRSCdPCiKp2W+HGGI+gk7UjIUm//zQ/C7aAuTIbK5jRGHMKJ60cGDZGtC LcS9346dZwLrbfop4pzaIaIEk7kSHLa33IzEqKN0+xR1eA4PpY+1qkV9x2Yb0jcWqCvz VQLA== 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=KkT1K4V0Sv2ZMoakBnb3DurRc6mK7Xt3/G9M48Xo3ok=; b=JweTCJYRKobB3eIoQAA7sU0wHXK08WYtV/noZhlxVVp7Ornhr8RBEIbUypxPWiIN+s i64eQoCaVr7cW/I51sjDGLiKioTHKhtsSbVEDxlcV3uNVYZMetV9PaO3Wg2Q/Ak63Wdc Atw+VL7pPpxhlgmZHCk3zdo7aQUVkNmA4G0uEqCBxLXjoIGokDWVKDTSMIai+rorJzzP X2bUpW2bMvD634xa5fpNed7OPkWe+e0op9qM54Mf9yJjGNxSdPQQf0L1fi/d0oaeK06A 5xuXW38U/544Sjas/lfl5+ClRcCGBCuZYlcQ1ylnmTIIgnKnI3wwFk25BiDCFTLQCKsm 7gcw== X-Gm-Message-State: APjAAAWKORO5EMixkRxF9Qh4uQ4TZImMWx1OfIfyPwejQ+bc3g6SfIlN x76E9LHOY5bVnVnEh4Mo2ZF4tM5tXlE= X-Google-Smtp-Source: APXvYqzRoyoDDkselbMarMcf1hxRfNHLK+lE+nPed7WIgwm9zra4qEcXvddh49Lr4j3mIvq8gncBaw== X-Received: by 2002:a1c:3d89:: with SMTP id k131mr4389255wma.24.1566377718498; Wed, 21 Aug 2019 01:55:18 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:17 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:16 +0200 Message-Id: <20190821085455.18508-22-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 de0170ee5f..74f09ba42b 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 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