From 3498a8d018fa02de17e1f9c4cda49f4c7edb3c6c Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 2 Aug 2017 18:50:34 -0400
Subject: depends: fix fontconfig with newer glibc

See comment for more detail
---
 depends/packages/fontconfig.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk
index fb97e0b9ec..12695db4b9 100644
--- a/depends/packages/fontconfig.mk
+++ b/depends/packages/fontconfig.mk
@@ -13,7 +13,13 @@ define $(package)_config_cmds
   $($(package)_autoconf)
 endef
 
+# 2.12.1 uses CHAR_WIDTH which is reserved and clashes with some glibc versions, but newer versions of fontconfig
+# have broken makefiles which needlessly attempt to re-generate headers with gperf.
+# Instead, change all uses of CHAR_WIDTH, and disable the rule that forces header re-generation.
+# This can be removed once the upstream build is fixed.
 define $(package)_build_cmds
+  sed -i 's/CHAR_WIDTH/CHARWIDTH/g' fontconfig/fontconfig.h src/fcobjshash.gperf src/fcobjs.h src/fcobjshash.h && \
+  sed -i 's/fcobjshash.h: fcobjshash.gperf/fcobjshash.h:/' src/Makefile && \
   $(MAKE)
 endef
 
-- 
cgit v1.2.3