summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2016-12-24 12:22:40 -0500
committerBradley Sepos <[email protected]>2016-12-24 12:22:40 -0500
commit39f658841ee45dbbfc70c402416804883b1095dc (patch)
treeae2898209d8cd7f165fce764d704dcfb0f495d95
parent573a7810cb2e995e0b86b623b7c6eeeb5f89b0bf (diff)
contrib: Patch fontconfig to allow setting RUN_FC_CACHE_TEST makevar.
-rw-r--r--contrib/fontconfig/A00-cachetest.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/contrib/fontconfig/A00-cachetest.patch b/contrib/fontconfig/A00-cachetest.patch
new file mode 100644
index 000000000..5c56ce3a8
--- /dev/null
+++ b/contrib/fontconfig/A00-cachetest.patch
@@ -0,0 +1,20 @@
+diff -u Makefile.am.orig Makefile.am
+--- fontconfig-2.12.1/Makefile.am.orig 2016-07-10 22:41:05.000000000 -0400
++++ fontconfig-2.12.1/Makefile.am 2016-12-24 12:16:04.000000000 -0500
+@@ -64,10 +64,12 @@
+ xmldir = $(XMLDIR)
+ xml_DATA = fonts.dtd
+
+-if CROSS_COMPILING
+- RUN_FC_CACHE_TEST=false
+-else
+- RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
++ifndef RUN_FC_CACHE_TEST
++ if CROSS_COMPILING
++ RUN_FC_CACHE_TEST=false
++ else
++ RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
++ endif
+ endif
+
+ # Creating ChangeLog from git log: