vlc | branch: master | Martin Storsjö <[email protected]> | Wed Apr 8 14:46:33 2020 +0300| [c2b60e813180c89e66e96d3300d0c8b2eae6db15] | 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c2b60e813180c89e66e96d3300d0c8b2eae6db15 --- 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 04e46c6ebd..2d4352860c 100644 --- a/contrib/src/harfbuzz/rules.mak +++ b/contrib/src/harfbuzz/rules.mak @@ -29,6 +29,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 $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
