From patchwork Wed Aug 25 18:03:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32299 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 A495C27BBE3; Wed, 25 Aug 2021 19:11:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2AD8F27BBE1 for ; Wed, 25 Aug 2021 19:11:25 +0100 (BST) Received: from localhost ([::1]:38772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxMy-0007Wi-A3 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:11:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxMe-0006sq-6x for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxMd-0005yS-VL for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxMd-00037p-QQ for guix-patches@gnu.org; Wed, 25 Aug 2021 14:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 34/52] gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991505011964 (code B ref 50201); Wed, 25 Aug 2021 18:11:03 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:10:50 +0000 Received: from localhost ([127.0.0.1]:47836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxMQ-00036u-4O for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:10:50 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxMF-000360-Kt for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:10:40 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4Gvv431NxwzMqynd for <50201@debbugs.gnu.org>; Wed, 25 Aug 2021 20:03:47 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3m9K; Wed, 25 Aug 2021 20:03:46 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:14 +0200 Message-Id: <20210825180332.5720-34-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914627; bh=qIAyVAEUEOtc606GaRNSOeWUaMUcsfj44Nl5oROg5Vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jlnsRY90gLGsP8tH/7n6VmPxNnA1YLOeL9UB2vUAkqWHGgRV85cBqr2E2fspIqeen GYxhLqLlv0tWoQ5jh6/1kfAFzNhKvA3+m+TPIVzPxs4e1cyZoWIdcWmAOOP9nKWK9l LeRhH09ivtwNtQ0F4Mqe5yLKhRYLhW7Bu/140bSS6hA4jc85wimEK/M8inqEHNKHcZ 1lrTdxLjxK8l88nNFHpJ9rnAXMQUvS5irWOl+LYMUIKGCmiNeBuWobGuJcxfH3DWHU /gpbzT+Qctexa2vh7lXXK6aWnW9JQGU+rVHmdid2hGVjp7fMDYYTiaGweLY/UK36AG wwBXVGQTLveaQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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/libdaemon.scm (libdaemon)[native-inputs]: Add "config" when cross-compiling for aarch64. (libdaemon)[arguments]<#:phases>{update-config.sub}: When cross-compiling for aarch64, update the "config.sub" script. --- gnu/packages/libdaemon.scm | 42 ++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index e47d66cfa7..9dc851e823 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Ludovic Courtès +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,8 +18,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libdaemon) + #:use-module (gnu packages autotools) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -45,21 +48,34 @@ "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) - (arguments - (if (%current-target-system) - ;; The 'setpgrp' test cannot provide an answer when cross-compiling, - ;; so provide the right one for glibc. - `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes" - - ;; TODO: Move this globally on the next - ;; rebuild cycle. - ;; Set a valid localstatedir for the - ;; benefit of the default - ;; 'daemon_pid_file_proc', used by the - ;; Hurd's console client. - "--localstatedir=/var")) + (native-inputs + (if (and=> (%current-target-system) target-aarch64?) + `(("config" ,config)) ; for config.sub '())) + (arguments + `(,@(if (%current-target-system) + ;; The 'setpgrp' test cannot provide an answer when cross-compiling, + ;; so provide the right one for glibc. + `(#:configure-flags (list "ac_cv_func_setpgrp_void=yes" + ;; TODO: Move this globally on the next + ;; rebuild cycle. + ;; Set a valid localstatedir for the + ;; benefit of the default + ;; 'daemon_pid_file_proc', used by the + ;; Hurd's console client. + "--localstatedir=/var")) + '()) + ,@(if (and=> (%current-target-system) target-aarch64?) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-config.sub + (lambda _ + ;; Replace outdated config.sub such that aarch64 + ;; will be recognised as an architecture. + (delete-file "config.sub") + (symlink (which "config.sub") "config.sub"))))) + '()))) ;; XXX: Stale URL, missing replacement. See . (home-page "http://0pointer.de/lennart/projects/libdaemon/")