Skip to content

Commit

Permalink
contrib: Fix fontconfig patch committed as 39f6588.
Browse files Browse the repository at this point in the history
  • Loading branch information
bradleysepos committed Dec 24, 2016
1 parent 9ee2772 commit 3f4a076
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions 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:

0 comments on commit 3f4a076

Please sign in to comment.