From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gKUzBiqGJmGkmQAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yIOoASqGJmFoagAAbx9fmQ (envelope-from ) for ; Wed, 25 Aug 2021 18:04:26 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9021D7009 for ; Wed, 25 Aug 2021 20:04:25 +0200 (CEST) Received: from localhost ([::1]:56080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGC-0008Ik-KU for larch@yhetil.org; Wed, 25 Aug 2021 14:04:24 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629914665; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=c1TzpS26rcjtYV4WUcZF+5NQ43HWXEftUJjg7hkf3NQ=; b=q5oCJdql6huI5CESbcIfXlJ3IwIL2r4kO2W+xarerhGot5yp1gauCBmsMFYHbq6eirfnu/ LE0EBXU+OeMtJLx2ZlBzyeLGH9LpKA9D4P3OyFkGu5CS9EhbTotHEfDOsuxOqwbUikE0kC XAMjMldUPCvK+5944GjDPokfPuY5ANkfJDXGoBGtpd9uENFQAfLavbOfVInN2hdRN/Uflv tNtV3sklYz7Hi3/rwrSUz0cFAXt5NK7T2M4I5b2Evpl+snidhQkXHv8jCTx7SYN4d7xg7o 1xP1ZbVzV8tY/ISaSHk+ZJ/18JtLe39KvaE9UD8N53ZpBDNDK3ZCcNzpFPluLA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914665; a=rsa-sha256; cv=none; b=N1gN3NUgLkOM2G7N7QjfwpwYDgN8z1kwpGmwZVMoHX7kzBXKXhFuHeoom9vGyah+U8vU+z DTbBwsf5WCZDjdlxeQObMaDU5KHMlWzAut9RMQHx84F3nZz46kLYPROGoynphyi1Ehk52s OjRbh6FCNHMeMUJjnwuaAuYVI34BRzMYoptngsDqqqij5MSRPcjVTknZDOj05N8CW/LPuW CmMbyKNlFkkILJkmXQkFOkmdQVcDC8lg3nUbh2o4fre7XG84e17adx6k0v1VsOj1ths495 BkqJboEm3BMecYDmgSx6SOHfXYEUrHUgi76o04/Y2t/Rc01liM2Q9/bzPBidBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Xatr6Gqf; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Xatr6Gqf; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9021D7009 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: h9R7ytI1KSEm * 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/") -- 2.33.0