[vlc-commits] Contribs: move harfbuzz to CMake

[Jean-Baptiste Kempf]

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri May 18 12:43:50 2018 +0200| [eed275e5060d7349162462163d011f98ea3da115] | committer: Jean-Baptiste Kempf

Contribs: move harfbuzz to CMake

(cherry picked from commit c1147c576b3c8be44c1e8081c3be196cb7c84193)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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 a7ffab6442..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) CFLAGS="$(CFLAGS)" ./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 $@