From patchwork Wed Aug 25 18:02:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32253 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 75B0D27BBE3; Wed, 25 Aug 2021 19:04:29 +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 3E26C27BBE1 for ; Wed, 25 Aug 2021 19:04:29 +0100 (BST) Received: from localhost ([::1]:56080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGG-0008Ik-8k for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFs-0007qU-KH for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFs-0000p3-BS for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFs-0002mu-5i for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 04/52] gnu: libcap: Fix cross-compilation build failures. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:04 +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.162991463710561 (code B ref 50201); Wed, 25 Aug 2021 18:04:04 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:57 +0000 Received: from localhost ([127.0.0.1]:47673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFk-0002kF-Ta for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:57 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFV-0002fv-Dv for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:42 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3gTB; Wed, 25 Aug 2021 20:03:40 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:44 +0200 Message-Id: <20210825180332.5720-4-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=1629914620; bh=c1TzpS26rcjtYV4WUcZF+5NQ43HWXEftUJjg7hkf3NQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xatr6GqfJteIlvfmZYd7fqyAnKaMf2qEDUzA6BIv38wsKD+E+Sawfgj7RHInN6LZ5 M60/0jLk5bIG8q1yY4I2nT3kPshkZlYfRVWJCANFAWP61/KD18lJetfLrxicKtg31m n7SpaBcOHH+xeiQ/rZCIG2InOtXFrgdk/SHNrmjFiOjz2c0FE4O0OwXimobyF+P3tq FfuotwO+x4AYUzctFwpXMc60qJFyg89wjweaPyKYgPEqGNbjsfHRG+Ei4/XhOnVl10 9MFTTeQS4KKsKRU2kxQo5uX9IPBtPeVXuik5/Q5uH3VrIRrZGlBNseRPD7bVCWrBKN KTnZaIVAO9gIw== 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/linux.scm (libcap)[arguments]<#:phases>{configure}: Don't use non-existent '%output' when cross-compiling. (libcap)[arguments]<#:make-flags>: Set "CROSS_COMPILE" and "BUILD_CC" when cross-compiling. --- gnu/packages/linux.scm | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1f52bccee8..0dd8cf4ed4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2812,20 +2812,32 @@ configuration (iptunnel, ipmaddr).") (base32 "1ych13qc1mvzv8iscbims5b317vxcmy5ffpmfy98zk7bgamz62b6")))) (build-system gnu-build-system) - (arguments '(#:phases - (modify-phases %standard-phases - (replace 'configure - ;; Add $libdir to the RUNPATH of executables. - (lambda _ - (substitute* "Make.Rules" - (("LDFLAGS \\?= #-g") - (string-append "LDFLAGS ?= -Wl,-rpath=" - %output "/lib")))))) + (arguments `(#:phases + ,#~(modify-phases %standard-phases + (replace 'configure + ;; Add $libdir to the RUNPATH of executables. + (lambda _ + (substitute* "Make.Rules" + (("LDFLAGS \\?= #-g") + (string-append "LDFLAGS ?= -Wl,-rpath=" + ;; TODO(core-updates): Use #$output + ;; unconditionally. + #$(if (%current-target-system) + #~#$output + '%output) + "/lib")))))) #:test-target "test" - #:make-flags (list "lib=lib" - (string-append "prefix=" - (assoc-ref %outputs "out")) - "RAISE_SETFCAP=no"))) + #:make-flags + (list "lib=lib" + (string-append "prefix=" (assoc-ref %outputs "out")) + "RAISE_SETFCAP=no" + ;; Tell the makefile to use TARGET-gcc and friends + ;; when cross-compiling. + ,@(if (%current-target-system) + `(,(string-append "CROSS_COMPILE=" + (%current-target-system) "-") + "BUILD_CC=gcc") + '())))) (native-inputs `(("perl" ,perl))) (supported-systems (delete "i586-gnu" %supported-systems)) (home-page "https://sites.google.com/site/fullycapable/")