From patchwork Thu Nov 9 17:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 56154 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 000A227BBE2; Thu, 9 Nov 2023 17:39:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6929627BBE9 for ; Thu, 9 Nov 2023 17:39:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1903-0001Yv-GS; Thu, 09 Nov 2023 12:39:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1900-0001Wo-2U for guix-patches@gnu.org; Thu, 09 Nov 2023 12:39:24 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r18zz-0003v6-Qo for guix-patches@gnu.org; Thu, 09 Nov 2023 12:39:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r190b-0000iD-SX; Thu, 09 Nov 2023 12:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67021] [PATCH] gnu: ruby: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 17:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67021@debbugs.gnu.org Cc: Christopher Baines X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by submit@debbugs.gnu.org id=B.16995515622682 (code B ref -1); Thu, 09 Nov 2023 17:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Nov 2023 17:39:22 +0000 Received: from localhost ([127.0.0.1]:48670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r18zx-0000hC-Hr for submit@debbugs.gnu.org; Thu, 09 Nov 2023 12:39:21 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43174) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r18zv-0000gx-Lu for submit@debbugs.gnu.org; Thu, 09 Nov 2023 12:39:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r18zC-0001Js-Qs for guix-patches@gnu.org; Thu, 09 Nov 2023 12:38:34 -0500 Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1r18zA-0003SN-3R for guix-patches@gnu.org; Thu, 09 Nov 2023 12:38:34 -0500 Received: from localhost.localdomain (unknown [183.247.5.45]) by APP-03 (Coremail) with SMTP id rQCowAD3_z8IGU1lBJTYAw--.23010S2; Fri, 10 Nov 2023 01:38:18 +0800 (CST) From: Zheng Junjie Date: Fri, 10 Nov 2023 01:37:10 +0800 Message-ID: <49737492e6f2c7ba3cf00ddb45fe5fb53476cf94.1699551430.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: rQCowAD3_z8IGU1lBJTYAw--.23010S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYS7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j 6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxV WxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvE ncxIr21le4C262xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I 8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AK xVWUJVWUGwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcV AFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8I cIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r 1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jeXdbUUUUU= X-Originating-IP: [183.247.5.45] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ruby.scm (ruby-2.6,ruby-2.7): Fix cross-compilation. [native-inputs]: when cross-compilation, add this-package. [arguments]<#:configure-flags>: when cross-compilation, add LDFLAGS. Change-Id: Iba6665ba3b1b3d5b3a9b6830a01f0f3284e35efb --- gnu/packages/ruby.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) base-commit: 42bec70a91d2205371c96287bcf565dcc5f5dd74 diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ff6829082c..1490c783fa 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,7 +130,13 @@ (define-public ruby-2.6 (build-system gnu-build-system) (arguments `(#:test-target "test" - #:configure-flags '("--enable-shared") ; dynamic linking + #:configure-flags + ,(if (%current-target-system) + '(list (string-append + "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--enable-shared") + ''("--enable-shared")) ; dynamic linking #:phases (modify-phases %standard-phases (add-before 'configure 'replace-bin-sh-and-remove-libffi @@ -147,6 +154,9 @@ (define-public ruby-2.6 "tool/rbinstall.rb") (("/bin/sh") (which "sh"))) #t))))) + (native-inputs (if (%current-target-system) + (list this-package) + '())) (inputs (list readline openssl-1.1 libffi gdbm)) (propagated-inputs @@ -177,7 +187,13 @@ (define-public ruby-2.7 "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877")))) (arguments `(#:test-target "test" - #:configure-flags '("--enable-shared") ; dynamic linking + #:configure-flags + ,(if (%current-target-system) + '(list (string-append + "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--enable-shared") + ''("--enable-shared")) ; dynamic linking #:phases (modify-phases %standard-phases (add-before 'configure 'replace-bin-sh-and-remove-libffi @@ -204,7 +220,10 @@ (define-public ruby-2.7 (delete-file "test/ruby/test_io.rb")))) '())))) (native-inputs - (list autoconf)))) + (append (if (%current-target-system) + (list this-package) + '()) + (list autoconf))))) (define ruby-2.7-fixed (package