summaryrefslogtreecommitdiffstats
path: root/contrib/fontconfig/A00-cachetest.patch
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/fontconfig/A00-cachetest.patch')
-rw-r--r--contrib/fontconfig/A00-cachetest.patch19
1 files changed, 8 insertions, 11 deletions
diff --git a/contrib/fontconfig/A00-cachetest.patch b/contrib/fontconfig/A00-cachetest.patch
index 5c56ce3a8..f13d4d38a 100644
--- a/contrib/fontconfig/A00-cachetest.patch
+++ b/contrib/fontconfig/A00-cachetest.patch
@@ -1,20 +1,17 @@
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)
++++ fontconfig-2.12.1/Makefile.am 2016-12-24 13:06:05.000000000 -0500
+@@ -65,9 +65,11 @@
xml_DATA = fonts.dtd
--if CROSS_COMPILING
+ if CROSS_COMPILING
- RUN_FC_CACHE_TEST=false
--else
++ 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
++ ifndef RUN_FC_CACHE_TEST
++ RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
++ endif
endif
# Creating ChangeLog from git log: