vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Fri May 18 12:43:50 2018 +0200| [c1147c576b3c8be44c1e8081c3be196cb7c84193] | committer: Jean-Baptiste Kempf
Contribs: move harfbuzz to CMake > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1147c576b3c8be44c1e8081c3be196cb7c84193 --- contrib/src/harfbuzz/rules.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak index 01ee97718b..3ccdcc7ca5 100644 --- a/contrib/src/harfbuzz/rules.mak +++ b/contrib/src/harfbuzz/rules.mak @@ -20,15 +20,15 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2: harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz $(UNPACK) - $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch $(MOVE) DEPS_harfbuzz = freetype2 $(DEPS_freetype2) -.harfbuzz: harfbuzz - cd $< && env NOCONFIGURE=1 sh autogen.sh - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(HARFBUZZCONF) - cd $< && $(MAKE) install +.harfbuzz: harfbuzz toolchain.cmake + cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + .. && $(MAKE) + cd $< && cd build && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
