[vlc-commits] contrib: harfbuzz: Avoid harfbuzz using 'icu-config' for finding ICU

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Wed Apr  8 14:46:33 2020 +0300| [75d143542065de229a20af64e129462e84e1500a] | committer: Martin Storsjö

contrib: harfbuzz: Avoid harfbuzz using 'icu-config' for finding ICU

When cross compiling, we shouldn't let packages' build systems
accidentally pick up libraries from the surrounding native environment.
Normally this is accomplished by setting PKG_CONFIG_LIBDIR.
Harfbuzz's configure script tries looking for ICU using the tool
icu-config, if it isn't found with pkg-config.

Set ICU_CONFIG to false, to avoid configure using and picking it up.

(cherry picked from commit c2b60e813180c89e66e96d3300d0c8b2eae6db15)

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

 contrib/src/harfbuzz/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index d4e9ad7651..eb140ea4dd 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -30,6 +30,6 @@ endif
 
 .harfbuzz: harfbuzz
 	$(RECONF)
-	cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) $(HARFBUZZ_CONF)
+	cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) $(HARFBUZZ_CONF) ICU_CONFIG=false
 	cd $< && $(MAKE) install
 	touch $@