From patchwork Mon Jul 8 09:59:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14524 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 B3C1B171D4; Mon, 8 Jul 2019 11:02:54 +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 71549171D2 for ; Mon, 8 Jul 2019 11:02:54 +0100 (BST) Received: from localhost ([::1]:40048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQU2-0006ZY-2l for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54995) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRY-0005RK-53 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRW-0003Cg-Mb for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRW-0003CY-IC for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRW-0004vU-Ex for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 21/31] gnu: mit-krb5: 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:18 +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.156257999818669 (code B ref 36477); Mon, 08 Jul 2019 10:00:18 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:58 +0000 Received: from localhost ([127.0.0.1]:57842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRB-0004qx-Q7 for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:58 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR2-0004nd-3C for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:48 -0400 Received: by mail-wm1-f65.google.com with SMTP id g67so9514221wme.1 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:47 -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=W/5jb2L9QoJrSstxoxV0MeUoUnp+wYamOajPJPW7GC8=; b=h4BoqNnSPPmcZUeBwxT+g+aMSCq5fYzLwF6tz08AjCUU0gJuPMTtbw3px0XRCumVtP sQTEznSvT66vb7xQIok7gBd+qX7mPjsDKvncDWvfxQ113ghXEqFxER4EwIGa8sQxJKTa QksVfhtSB+Aq7MVHKVcLw+rpoGQkqGyG1egkwDZrhOUFCpX/CGgZOZ56/Tfmbv4xrNXL 6lf04c+LMhMbkm0txwVJ0ilEk4B/fRQkOqagVCdznOwdUrUOK/ld/6c1ZDxPZcRDPRF6 eNhlXlxoR86M1ZMnlv46bU6alL1FOYg0Ktb9a9eIk1FVnLB7b0tFsUQj5iFul4bFoT97 kQFg== 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=W/5jb2L9QoJrSstxoxV0MeUoUnp+wYamOajPJPW7GC8=; b=pnuKbCtvKaXIiNqngz/rZ5ZEPFVu238gO6uYqkfW2BaFWHxguszdtM4MCsEEEroCPG 5J/pMPewpjkcCtp2gsxMK0V5w64ReFvNy+bV0VaONeQJEwmF7EZqNYt+M+vCxshLvEVy NSdjZcRKZIFVSsdprUQNaDZ4BaO6xgCtyT+0bHRQrtMWrt0+h4dv2NwFGRxb6FGKk27i D7AVwkCILYMBfYyJpgVt8dKDoSQkvDI4l7XpDqSlldtYA0xHdC60Gr24dqt5WsXIvvct SF/1NruF8WKzLtITV4l6U47ExTLyRMd3BLUsiY9iGDswRGY1Sq+l6uydcTsKX36lZBmQ +eaQ== X-Gm-Message-State: APjAAAUI/I3+eF6y8uBQuNaAh3+LFoLH+zeHgrhajq9r8aVeiZNS7O6B A1+m8IQuyp/l0RpEtkQ25KnUTwKr X-Google-Smtp-Source: APXvYqxDDsQl9N50F0zQikPmzlLS8dmj1AraC+eAt3M1ndZ01SGV8CP+KbJDqWCsJT8ZEC/h2lS8Lw== X-Received: by 2002:a1c:5f87:: with SMTP id t129mr16995275wmb.150.1562579981998; Mon, 08 Jul 2019 02:59:41 -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.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:41 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:03 +0200 Message-Id: <20190708095913.3460-22-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/kerberos.scm (mit-krb5)[arguments]: Disable tests when cross-compiling. Add cross-compilation specific configure-flags and make-flags. Search for perl in native-inputs or inputs. --- gnu/packages/kerberos.scm | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 873f5d8a37..8be4bd1ccc 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,9 +69,23 @@ ("perl" ,perl))) (arguments `(;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call - ;; while running the tests in 'src/tests'. - #:tests? ,(string=? (%current-system) "x86_64-linux") + ;; while running the tests in 'src/tests'. Also disable tests when + ;; cross-compiling. + #:tests? ,(and (not (%current-target-system)) + (string=? (%current-system) "x86_64-linux")) + #:configure-flags + (list ,@(if (%current-target-system) + '("krb5_cv_attr_constructor_destructor=yes" + "ac_cv_func_regcomp=yes" + "ac_cv_printf_positional=yes" + "ac_cv_file__etc_environment=yes" + "ac_cv_file__etc_TIMEZONE=no") + '())) + #:make-flags + (list ,@(if (%current-target-system) + '("CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1") + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory @@ -78,8 +93,8 @@ (chdir "src") #t)) (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((perl (assoc-ref (or native-inputs inputs) "perl"))) (substitute* "plugins/kdb/db2/libdb2/test/run.test" (("/bin/cat") (string-append perl "/bin/perl")) (("D/bin/sh") (string-append "D" (which "sh")))