From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id gFGqMxVZKWWhHAAA9RJhRA:P1 (envelope-from ) for ; Fri, 13 Oct 2023 16:49:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gFGqMxVZKWWhHAAA9RJhRA (envelope-from ) for ; Fri, 13 Oct 2023 16:49:57 +0200 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 89A0F3787E for ; Fri, 13 Oct 2023 16:49:57 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WW8h1sWw; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697208597; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=EryUvIqWTlyYHoAOIwZboXZcOxMRa015vjLyGXD5At4=; b=g6q/a4t10GtNp6rBXxuzq3jH5naOepLqwlrzpcl6kJCt1wxaI3VHJLN/UzoHjPDVmlTkn1 gsZ57oPqv6VC541pyW6OK9gQtKodZh80tXHy8zqLhqtjVtHbeECcEl2aAzezyl2J4/K1G+ 5+w3EUVi6wfdZTNnXznfqHBdDKGC+h1TGn1+T1NqvHZHpN9rJcbSO2OzT9oi6cUFQh+DLo 4cFcyhexxFiW+4q1BUS2ijNA5FV3foulzjLwB6hPTRSKiJeH6u1soqMB89wq+xXz9xK1wL x/XkpuirIR6FFYwil3pdEz2ka5AU0tvYJuLnCtHt5sqLNk6sOTOlhuYvVQrsnA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=WW8h1sWw; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697208597; a=rsa-sha256; cv=none; b=OV9KLoC8stUuU4WdskAQnTu/gkJZegmZhemMhVnzhIaSJixs2UNXwTxnp4AG9ipM53K2WC nD0LQihmxtwbabbjwkUBEMQGQlM8kEulo80WuCEXuAozn9XQM/HhkCbEG209iA3/4S55/o NvFmZd41q52LFzVeGAw0apvHYSFWZbNWYU4hByUsA8onB9tdadeqBSjDJWwlqJXI/PhFJm j+7NkiuLyhV4wnsxcZ5ePd0u9ljrBVi7fV7RvndceMQvZZyQZ9xGRqqt7aTR9+WUwJDWgD CUQJg5BQ2XDZFA/b/KxNaXhBQLWZWjufxUsEuMQh/iCmdmDmysWF4Fbel0IFhg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrJTz-00072b-Ft; Fri, 13 Oct 2023 10:49:43 -0400 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 1qrJTv-0006zP-8m for guix-patches@gnu.org; Fri, 13 Oct 2023 10:49:39 -0400 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 1qrJTu-0003Yd-UE for guix-patches@gnu.org; Fri, 13 Oct 2023 10:49:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qrJUH-00051u-MH for guix-patches@gnu.org; Fri, 13 Oct 2023 10:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66424] [PATCH core-updates] gnu: libxkbcommon: Fix cross-compile. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Oct 2023 14:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: Zheng Junjie , 66424@debbugs.gnu.org, Marius Bakke Received: via spool by 66424-submit@debbugs.gnu.org id=B66424.169720858519308 (code B ref 66424); Fri, 13 Oct 2023 14:50:01 +0000 Received: (at 66424) by debbugs.gnu.org; 13 Oct 2023 14:49:45 +0000 Received: from localhost ([127.0.0.1]:47061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrJU0-00051L-2V for submit@debbugs.gnu.org; Fri, 13 Oct 2023 10:49:45 -0400 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]:44186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrJTo-00050v-Ea for 66424@debbugs.gnu.org; Fri, 13 Oct 2023 10:49:42 -0400 Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3b2b1a6fd5eso348229b6e.0 for <66424@debbugs.gnu.org>; Fri, 13 Oct 2023 07:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697208542; x=1697813342; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=EryUvIqWTlyYHoAOIwZboXZcOxMRa015vjLyGXD5At4=; b=WW8h1sWwJUa71eiIkj9v978hOiAn75Z9z3/nu9uHb8RHFbmQY9zH6iQkCnMnppefTO d5jtP/r4k0FSx74zTRSj3sPcqOgvvzsEhV+CINezJl7pyib1hFR5r2C7boNSI5I7dCj5 OqXr1Dgbntu4fcMdDA+Bdr6vRgZlvcBf8wZ6aM/3JN2gvSS2NvG2XvQmtcYa5dtf/sbJ DnneyzyQshtfvTwLT67un04mBMESml/mlDgwRq5S1W6oe+0qcrIYGr5Sy86amtgLr8Rs dphEhz+YPnhb8+7/83HA+9BpJ1NPZ675cVxyDAvPBEwUV04VBlY0LZzLmFRvQiac4IiJ 8FMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697208542; x=1697813342; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EryUvIqWTlyYHoAOIwZboXZcOxMRa015vjLyGXD5At4=; b=IicLWFeqE1uaJF94aqvIAHfkt4k2IA+c663xNJLWgVgrWL+0E4s1kTmpN8NiGKRZr8 ZTvBnXrxS24BlD3GkcP/+twesdPZnCTuJNXtVv/igaa2xqwyCYr4oeW14RzzqFRetNtk bmIVhKAicj6UPaarB6A0WeEvgHCqf1K0B0OpC+r42W/KwOEaqLkFTPvRM6by0+MADASw ixW8UYjp4tkTvbVKYbsJAUzUghSMco/PSUTSrwgqyA8a4651DHubOeGlDRGanPPPPA9N hGbbEPGG1C5oUuSvZSivw4MTFXpH2Akoyph1UwvHPG6FdskiUlU1ysjtecx56dAJnRIu t9Jw== X-Gm-Message-State: AOJu0YxcGfEQz/p3b/htj63Q2iz4CWv6OpUymEqKjJjBY0GA+s8eze7D JoYSow4DZ/CCTs2pNft9Bns= X-Google-Smtp-Source: AGHT+IGYuFZordn3QLZeXqd9u2utAD8t/GUzDAOXQ46ZEciaqovarTT3yAWzV3m058S6q37DeXnWWw== X-Received: by 2002:a05:6808:bd4:b0:3a7:8e05:1699 with SMTP id o20-20020a0568080bd400b003a78e051699mr38089506oik.37.1697208542536; Fri, 13 Oct 2023 07:49:02 -0700 (PDT) Received: from hurd (dsl-156-181.b2b2c.ca. [66.158.156.181]) by smtp.gmail.com with ESMTPSA id c27-20020a0ca9db000000b0066d132b1c8bsm713002qvb.102.2023.10.13.07.49.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 07:49:02 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <87r0lz7lzg.fsf@protonmail.com> (John Kehayias's message of "Thu, 12 Oct 2023 18:07:56 +0000") References: <87r0lz7lzg.fsf@protonmail.com> Date: Fri, 13 Oct 2023 10:49:01 -0400 Message-ID: <87jzrq60iq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.84 X-Spam-Score: 2.84 X-Migadu-Queue-Id: 89A0F3787E X-Migadu-Scanner: mx2.migadu.com X-TUID: 5VCM8QElHraU Hi John, John Kehayias writes: > Hello, > > (CC'ing authors of two related commits too) > > On Mon, Oct 09, 2023 at 11:07 PM, Zheng Junjie wrote: > >> * gnu/packages/xdisorg.scm (libxkbcommon): Fix cross-compile. >> [native-inputs]: When cross-compile add PKG-CONFIG-FOR-BUILD. >> --- >> gnu/packages/xdisorg.scm | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm >> index db948a9318..84bdcad031 100644 >> --- a/gnu/packages/xdisorg.scm >> +++ b/gnu/packages/xdisorg.scm >> @@ -527,9 +527,13 @@ (define-public libxkbcommon >> wayland-protocols >> xkeyboard-config)) >> (native-inputs >> - (list bison doxygen pkg-config python >> - ;; wayland-scanner is required at build time. >> - wayland)) >> + (append >> + (if (%current-target-system) >> + (list pkg-config-for-build) >> + '()) >> + (list bison doxygen pkg-config python >> + ;; wayland-scanner is required at build time. >> + wayland))) >> (arguments >> (list #:configure-flags >> #~(list (string-append "-Dxkb-config-root=" >> >> base-commit: 9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554 > > When searching the log it looked like this had already been done on > core-updates in 5841ac3981a3a08968704728cef14accd14e7a1c (Marius) but I > was confused when I didn't see it. Looks like the pkg-config-for-build > was dropped (accidentally?) in 5841ac3981a3a08968704728cef14accd14e7a1c > (Maxim) > > Is this still needed? On the top of my head, I thought pkg-config-for-build had been obsolete by the pkg-config symbol being dynamically bound to something that makes sense for the context it's used in, via some macro trickery. I may have misunderstood things. > And if so, I can do it on mesa-updates very soon, since libx11 and > libxpm will be ungrafted and related packages (like mesa) updated too. > Or we can leave it to core-updates if that makes more sense. I guess it depends which branch is expected to be the shortest lived one; I'm giving about a month to let more time for core-updates to merge interesting bits and build the branch and fix breakage. Take this with a grain of salt; it's not fixed in stone. Thanks, Maxim