[vlc-commits] extras/tools: added ninja

Konstantin Pavlov git at videolan.org
Thu Nov 8 15:13:52 CET 2018


vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Nov  8 15:42:11 2018 +0300| [f6aeb194f430db6184df627e49e872e276d8449c] | committer: Konstantin Pavlov

extras/tools: added ninja

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6aeb194f430db6184df627e49e872e276d8449c
---

 extras/tools/SHA512SUMS   |  1 +
 extras/tools/bootstrap    |  1 +
 extras/tools/packages.mak |  3 +++
 extras/tools/tools.mak    | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 09e01036d1..bca846159e 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -19,3 +19,4 @@ e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdb
 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
 ba4921530049f002c362bc420bd87181074893109ce4b1fedb18545227d27ea96c09798eb02f1f8fabbf6ac5c185b0b7eca42df2a34ad0559f95a97d78811702  meson-0.48.1.tar.gz
+1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2  ninja-1.8.2.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 6746af33fb..0dbc637cd7 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -154,6 +154,7 @@ check_nasm 2.13.01
 check gettext
 check help2man
 check meson 0.48.1
+check ninja
 
 DEPS_ONLY="help2man"
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index cf794e34d6..3392419810 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -62,3 +62,6 @@ HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
 
 MESON_VERSION=0.48.1
 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
+
+NINJA_VERSION=1.8.2
+NINJA_URL=https://github.com/ninja-build/ninja/archive/v$(NINJA_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index c8b737c622..75f0aa8949 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -418,6 +418,25 @@ DISTCLEAN_PKG += meson-$(MESON_VERSION).tar.gz
 CLEAN_FILE += .buildmeson
 
 #
+# ninja build
+#
+
+ninja-$(NINJA_VERSION).tar.gz:
+	$(call download_pkg,$(NINJA_URL),ninja)
+
+ninja: ninja-$(NINJA_VERSION).tar.gz
+	$(UNPACK)
+	$(MOVE)
+
+.buildninja: ninja
+	(cd $<; ./configure.py --bootstrap && mv ninja $(PREFIX)/bin/)
+	touch $@
+
+CLEAN_PKG += ninja
+DISTCLEAN_PKG += ninja-$(NINJA_VERSION).tar.gz
+CLEAN_FILE += .buildninja
+
+#
 #
 #
 



More information about the vlc-commits mailing list