vlc/vlc-3.0 | branch: master | Konstantin Pavlov <[email protected]> | Thu Nov 8 15:42:11 2018 +0300| [2d7696aa3a7fac9b857e731153ff67df35727979] | committer: David Fuhrmann
extras/tools: added ninja (cherry picked from commit f6aeb194f430db6184df627e49e872e276d8449c) Signed-off-by: David Fuhrmann <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2d7696aa3a7fac9b857e731153ff67df35727979 --- 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 39bac78784..abc6410fe0 100644 --- a/extras/tools/SHA512SUMS +++ b/extras/tools/SHA512SUMS @@ -16,3 +16,4 @@ bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be98 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz 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 1bfcb8c5e5..83cc33cea9 100755 --- a/extras/tools/bootstrap +++ b/extras/tools/bootstrap @@ -87,6 +87,7 @@ check bison 3.0.0 check flex check nasm 2.13.01 check meson 0.48.1 +check ninja [ -n "$NEEDED" ] && mkdir -p build/bin && echo "To-be-built packages: `echo $NEEDED | sed 's/\.//g'`" diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak index 3ce2b51745..ffe91ee980 100644 --- a/extras/tools/packages.mak +++ b/extras/tools/packages.mak @@ -56,3 +56,6 @@ FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex- 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 78330009e8..36614640b3 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -371,6 +371,25 @@ DISTCLEAN_PKG += meson-$(MESON_VERSION).tar.gz CLEAN_FILE += .meson # +# ninja build +# + +ninja-$(NINJA_VERSION).tar.gz: + $(call download_pkg,$(NINJA_URL),ninja) + +ninja: ninja-$(NINJA_VERSION).tar.gz + $(UNPACK) + $(MOVE) + +.ninja: ninja + (cd $<; ./configure.py --bootstrap && mv ninja $(PREFIX)/bin/) + touch $@ + +CLEAN_PKG += ninja +DISTCLEAN_PKG += ninja-$(NINJA_VERSION).tar.gz +CLEAN_FILE += .ninja + +# # # _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
