Attachment 15116 Details for Bug 48602 – Вариант предлагаемого патча на макросы

[patch] Вариант предлагаемого патча на макросы

Specify-sourcedir-after-builddir.patch (text/plain), 4.10 KB, created by Arseny Maslennikov on 2023-11-27 20:39:55 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Arseny Maslennikov

Created: 2023-11-27 20:39:55 MSK

Size: 4.10 KB

patch

obsolete

>Return-path: <arseny@altlinux.org>
>Envelope-to: ar@cs.msu.ru
>Delivery-date: Sat, 14 Oct 2023 16:36:43 +0300
>Received: from smtp.altlinux.org ([194.107.17.36]:59030)
>	by mail.cs.msu.ru with esmtp (Exim 4.94.2 (FreeBSD))
>	(envelope-from <arseny@altlinux.org>)
>	id 1qreor-00041V-JX
>	for ar@cs.msu.ru; Sat, 14 Oct 2023 16:36:43 +0300
>Received: by smtp.altlinux.org (Postfix, from userid 107)
>	id 4EDFEC0A85; Sat, 14 Oct 2023 16:36:38 +0300 (MSK)
>Received: from mail.cs.msu.ru (mail.cs.msu.ru [188.44.42.39])
>	by smtp.altlinux.org (Postfix) with ESMTP id E0D44C0A5A;
>	Sat, 14 Oct 2023 16:36:36 +0300 (MSK)
>DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
>	d=altlinux.org; s=dkim; h=Subject:Content-Transfer-Encoding:MIME-Version:
>	Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:
>	Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
>	:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:
>	List-Subscribe:List-Post:List-Owner:List-Archive;
>	bh=CdMCXPsaF4zLgo+PdwgViBhnG3lS1UE4lCbvCPHiEss=; b=fKElevDRPp/wKbVelaQOR/lTmu
>	m1ztUMFe+3D2NrhdLPIPL72DTqWTPRXtcyx+/7Wu1pShh6RRUyroAhgQaRGdeWT+eXEWIjBs02YXB
>	qxrJCknbsk/LM/cFPQ5NOJslPkNJbAQPyUMtNG9bV85vs/Vm61llgoNO0Z8MuyZWyzpa56gGknbxk
>	kK22/8KaT7Y+3Q16OU4klklOv0vZQVcM96L82mjFAgz4h4pzLdX4aLp7oRW97yS9sMDENolNHP/OK
>	c84PeKnjMQGkKqum/nm8XAyWya/vYCBouS70AZ51VkR6ejcqXvQN6YG0b5miurAg0YR6Xkx2kzyYz
>	38tuxQ+w==;
>Received: from [10.15.13.39] (port=50736 helo=horse..)
>	by mail.cs.msu.ru with esmtpsa  (TLS1.3) tls TLS_AES_256_GCM_SHA384
>	(Exim 4.94.2 (FreeBSD))
>	(envelope-from <arseny@altlinux.org>)
>	id 1qreok-0002EB-E9; Sat, 14 Oct 2023 16:36:36 +0300
>From: Arseny Maslennikov <arseny@altlinux.org>
>To: Yuri Sedunov <aris@altlinux.org>
>Cc: Arseny Maslennikov <arseny@altlinux.org>
>Date: Sat, 14 Oct 2023 16:36:09 +0300
>Message-Id: <20231014133609.1454757-1-arseny@altlinux.org>
>X-Mailer: git-send-email 2.33.8
>MIME-Version: 1.0
>Content-Transfer-Encoding: 8bit
>X-ACL-Warn: your reversed address is smtp.altlinux.org
>X-SA-Exim-Connect-IP: 194.107.17.36
>X-SA-Exim-Mail-From: arseny@altlinux.org
>Subject: [PATCH muon.srpm] %muon_meson: Specify sourcedir after builddir
>X-SA-Exim-Version: 4.2.1
>X-SA-Exim-Scanned: No (on mail.cs.msu.ru); Unknown failure
>
>The reference Meson implementation has long been accepting two
>non-option arguments after `meson setup`. If only one of them was
>present, it was interpreted as the builddir name. If both were present,
>the first one with a `meson.build` file inside was considered the
>sourcedir, with the other as builddir (with all other sanity checks
>applied afterwards). The --help hint was recommending to specify
>sourcedir before builddir for little reason, and that order crept up
>into %meson in ALT.
>
>Lately though meson upstream have changed the --help hint to recommend
>`meson setup [builddir] [sourcedir]`, which frankly makes a bit more
>sense since builddir is always passed first, and sourcedir is the CWD if
>the arg is missing. The behaviour did not change, though.
>
>It looks like muon _never_ supported the `[s] [b]` order even in the
>meson-compatible wrapper they provide, and I feel like they will be
>reluctant to accept a patch to support both arg orders, and even if they
>do they might just forget to tag a release.
>
>To make %muon_meson work, we replace `%__sourcedir %__builddir` with the
>opposite order.
>
>I also suggest to make a similar change in %meson as well, for
>uniformity reasons. Jussi's meson never cared about the order and does
>not care anyway, so that will be backwards compatible.
>---
> muon.macros | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/muon.macros b/muon.macros
>index 057d02d..9c3b32a 100644
>--- a/muon.macros
>+++ b/muon.macros
>@@ -46,7 +46,7 @@ DESTDIR=%buildroot %__muon -C %{__builddir} install
>   CXXFLAGS="${CXXFLAGS:-%optflags}"; export CXXFLAGS; \
>   FFLAGS="${FFLAGS:-%optflags}"; export FFLAGS; \
>   FCFLAGS="${FCFLAGS:-%optflags}"; export FCFLAGS; \
>-  %__muon meson setup %{__sourcedir} %{__builddir}  \\\
>+  %__muon meson setup %{__builddir} %{__sourcedir}  \\\
> 	-Doptimization=%{_optlevel} \\\
> 	%{?_enable_debug:-Ddebug=true} \\\
> 	-Dprefix=%{_prefix} \\\
>-- 
>2.33.8
>

Actions: View | Diff

Attachments on bug 48602: 15116