From patchwork Wed Oct 2 09:58:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15557 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 AF2C41749F; Wed, 2 Oct 2019 11:00:33 +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 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 56FEE1749D for ; Wed, 2 Oct 2019 11:00:33 +0100 (BST) Received: from localhost ([::1]:53128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQu-0003mY-An for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:00:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51025) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQX-0003iq-OZ for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQW-0008U7-E6 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQW-0008Tw-AV for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQW-0000YO-9b for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 04/23] gnu: cyrus-sasl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00:08 +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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103761805 (code B ref 36477); Wed, 02 Oct 2019 10:00:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:36 +0000 Received: from localhost ([127.0.0.1]:35443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPw-0000Sb-2t for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:35 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPs-0000RQ-Up for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:30 -0400 Received: by mail-wm1-f67.google.com with SMTP id r17so4541740wme.0 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:28 -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=nFkg0qIbp35QLLEDNk6u85RA07fXG5PqFPTPaj94Las=; b=DRAWiSSsX+M2oH1uL87wRUeIigAiaKPpVW3W3OhkqTC2JOJbH/+Mfk/+ELXZD6Hc7Z C7Kc5bE+ro5KgSxW3ayZgzy0zDf5wU7dzpnIRabww/RKxBh7XBcgaetsvyKz0w6YZAnD SsnWwy63pFApLy/6he0R9v/J9i0jkYguoyDYhTqfLAdd1ZmSjDiz6AoTQ8vwTbDXVALJ 9K0ttpuwKs1dVufylvpJrw6KMIyUV5GAl0IiU50c9Vd0+sX33uW6p9nCIrrgCI1LJjSa 8z/tykDAIw7YU+NvH9k3GAHPN6neTJFbVI1I3fNS5XKK7siw+XptPjD4qz+XAK4adbJy Nf8w== 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=nFkg0qIbp35QLLEDNk6u85RA07fXG5PqFPTPaj94Las=; b=TpXldJPEnUO0nce+UiHX54o7qV8Jsd99w+klGwqQAtYMwnRUENL2mKGsllInpHeEHW 5NMK1rD4ySGUaLTZcP/m1yAh0YKdFQeJkAx3aE1jvwO6a4kYr0ZfLjSks3UfuoBL/S/L 8JffhOa2XDUyM41+4cFADr2n1RQbpPCWZ4Rdlegkv/Gj4du6CJnnenIbbMvUxFwjhvMY dVJL5LIAATdtJ6c8YmsioY9Xg/wI4q0qj5AURfK973rFgBoZpEEsXqktcet5ygFBSbtc EFrSgg44SOQekCSkKf7myJ2d4/th/MDWN4R4GIgYpDNMoInFtpxgMMMToS+mO/gi4QxI PKfg== X-Gm-Message-State: APjAAAW6pG4a+HlbsugxW/ib7knUeYGR42PYnlcjBhXsZOhKitgUlhpY WpapQAOvNLctvRpwVc0bOrWktqbQ X-Google-Smtp-Source: APXvYqwJ9QHcHKbJGiC0bIZgn/x3mh0aS2fwSOePQRsUF23wRKJEaxfSTpxiQ1p56d+DYitd+mMiUw== X-Received: by 2002:a1c:bc46:: with SMTP id m67mr2192826wmf.126.1570010362915; Wed, 02 Oct 2019 02:59:22 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:22 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:45 +0200 Message-Id: <20191002095904.6325-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 a1190af0db..3acb44e450 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -758,6 +758,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