From patchwork Fri Jun 21 21:29:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2311 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 5EF59887664 for ; Fri, 21 Jun 2019 12:29:58 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45Vc1141sKz5KKZZ; Fri, 21 Jun 2019 12:29:57 +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 45Vc0y3drXz5KK8p; Fri, 21 Jun 2019 12:29:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1561116594; 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=ANsKuKTaeoEfFTmVlTJ0Tqwx6ORr1p5oD1F62XINi4w=; b=bq4TEka9gDvvO54irFJmKir3iPL4LmXDIn3BZ37mIxkAEVE3AW9odqKMCXnJJ8jfmzDTCM zMSih5aMfCjVQkOF6cQw9+ToX9k3ZixWM4rgLeQ21qx34KM051Yo5HMcjwgvkXY7Oe1wYv XCBZYOsAbysx2Pci22GQkm3U+siG/YL1Lgt+Fe5jAyOZEeu8QguoblBvV7i6nEaKsJnImW aPeG23q36RdfvAP85EPGpSSmglBaB/9U81cYvHY9xbxH7mkQcBT8F89T95HJiPdx/6G1vW EhygLGfb8II6WxeS6LmM4x0wDK0lp8MriCuNlcUvlqg/O19EROPpXMEXR8rRYQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1561116594; 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=ANsKuKTaeoEfFTmVlTJ0Tqwx6ORr1p5oD1F62XINi4w=; b=Fxh8seOPBfHy9X4AJ/JPJfDXohMo+jKA2pLDauyON+rT0VXtaKdR2UXsE3X1QtWVqc4ghQ gfhyx+eQFvEHQECA== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2] ninja: Update to 1.9.0 Date: Fri, 21 Jun 2019 13:29:50 +0200 Message-Id: <20190621112950.18542-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 --- ninja/ninja.macro | 21 +++++++++++++++++++++ ninja/ninja.nm | 8 +++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 ninja/ninja.macro diff --git a/ninja/ninja.macro b/ninja/ninja.macro new file mode 100644 index 000000000..8d2d0c75c --- /dev/null +++ b/ninja/ninja.macro @@ -0,0 +1,21 @@ +# +# ninja-build macros +# + + +__ninja = %{bindir}/ninja +__ninja_common_opts = -v %{PARALLELISMFLAGS} + +ninja_build = \ + %{__ninja} \ + %{__ninja_common_opts} + +ninja_install = \ + DESTDIR=%{BUILDROOT} \ + %{__ninja} install \ + %{__ninja_common_opts} + +ninja_test = \ + %{__ninja} test \ + %{__ninja_common_opts} + diff --git a/ninja/ninja.nm b/ninja/ninja.nm index e0793d8a0..ef54e5d99 100644 --- a/ninja/ninja.nm +++ b/ninja/ninja.nm @@ -4,7 +4,7 @@ ############################################################################### name = ninja -version = 1.8.2 +version = 1.9.0 release = 1 groups = Applications/System @@ -55,6 +55,12 @@ build # Install ninja syntax highlighting for vim. install -Dpm0644 misc/ninja.vim %{BUILDROOT}%{datadir}/vim/vimfiles/syntax/ninja.vim + + # 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