From patchwork Fri Jun 21 21:31:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2312 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id CA38D887664 for ; Fri, 21 Jun 2019 12:31:32 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45Vc2r1rSyz5M5fD; Fri, 21 Jun 2019 12:31:32 +0100 (BST) Received: from tuxedo.tremer.co.uk (unknown [88.215.19.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45Vc2j0fMpz5M5fD; Fri, 21 Jun 2019 12:31:25 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1561116685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=M7opW0eCb+FNA8QjeEHaXhVhgRQhBSQqx4Ikk3xSGgU=; b=rg+ckRuhOTcIoIUOm5d8Rlon2pu15uIMDwY3tdu8N+b0X5SmH6F+snrHTeJIa8QhekKyXs LjCVumFExidgdQuL5sossoMAupRwZCgxjFTk+aK6mbJxBzQX+Y2eYpaeHfLue/Vmru3bql hRfaVZh/krKGm6Y/2Mk04uS4XA5QuzaufGgtcq7MKqfYcpw1q7xf2YKyQsIUv88BDQzAlU LN29Y3nwdQHxveeglwsWzXkhxorFTpnDAVxAn4qixPbu9baToQWv/DVlHCvyTP7kCoL81I JA1Tl0oXwRWgosWRFELo5fDdBefoez+9koL3quZzKdxtEbECoX4wcZMitkUqyA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1561116685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=M7opW0eCb+FNA8QjeEHaXhVhgRQhBSQqx4Ikk3xSGgU=; b=9baAxtixrqk9+gpZBzJmLWoFX+E92uu4Ef39UzqZ5bQ0JgvJ7jQ73DTlFJPGQk2RtpxPyL xrObGzaX59q/3RAQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] meson: Update to 0.50.1 Date: Fri, 21 Jun 2019 13:31:23 +0200 Message-Id: <20190621113123.18666-1-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" X-Spam: Yes * Also add macro file for pakfire. Signed-off-by: Stefan Schantl --- meson/meson.macro | 42 ++++++++++++++++++++++++++++++++++++++++++ meson/meson.nm | 8 +++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 meson/meson.macro diff --git a/meson/meson.macro b/meson/meson.macro new file mode 100644 index 000000000..f26c7af21 --- /dev/null +++ b/meson/meson.macro @@ -0,0 +1,42 @@ +# +# Meson macros +# + + +__meson = %{bindir}/meson +__meson_wrap_mode = nodownload +__meson_auto_features = enabled + +_smp_mesonflags = %{PARALLELISMFLAGS} + +meson = \ + %{__meson} \ + --buildtype=plain \ + --prefix=%{prefix} \ + --libdir=%{libdir} \ + --libexecdir=%{libexecdir} \ + --bindir=%{bindir} \ + --sbindir=%{sbindir} \ + --includedir=%{includedir} \ + --datadir=%{datadir} \ + --mandir=%{mandir} \ + --infodir=%{infodir} \ + --localedir=%{datadir}/locale \ + --sysconfdir=%{sysconfdir} \ + --localstatedir=%{localstatedir} \ + --sharedstatedir=%{sharedstatedir} \ + --wrap-mode=%{__meson_wrap_mode} \ + --auto-features=%{__meson_auto_features} \ + . %{DISTRO_MACHINE} + +meson_build = \ + %{ninja_build} -C %{DISTRO_MACHINE} + +meson_install = \ + %{ninja_install} -C %{DISTRO_MACHINE} + +meson_test = \ + %{__meson} test \ + -C %{DISTRO_MACHINE} \ + %{PARALLELISMFLAGS} \ + --print-errorlogs diff --git a/meson/meson.nm b/meson/meson.nm index 208966a79..b7a687155 100644 --- a/meson/meson.nm +++ b/meson/meson.nm @@ -4,7 +4,7 @@ ############################################################################### name = meson -version = 0.48.1 +version = 0.50.1 release = 1 arch = noarch @@ -40,12 +40,18 @@ build install %{python3} setup.py install -O1 --skip-build --root %{BUILDROOT} + + # Install pakfire macro. + mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros + install -v -m 644 %{DIR_SOURCE}/%{name}.macro \ + %{BUILDROOT}/usr/lib/pakfire/macros end end packages package %{name} requires + ninja-build >= 1.9.0 python3-setuptools end end