diff options
| author | Cory Fields <[email protected]> | 2017-08-02 18:50:34 -0400 |
|---|---|---|
| committer | Cory Fields <[email protected]> | 2017-08-02 21:27:22 -0400 |
| commit | 3498a8d018fa02de17e1f9c4cda49f4c7edb3c6c (patch) | |
| tree | 2ecbf26ae1c2a0799ac0f48f4af2044b9a6105fd | |
| parent | Merge #10831: Batch flushing operations to the walletdb during top up and inc... (diff) | |
| download | discoin-3498a8d018fa02de17e1f9c4cda49f4c7edb3c6c.tar.xz discoin-3498a8d018fa02de17e1f9c4cda49f4c7edb3c6c.zip | |
depends: fix fontconfig with newer glibc
See comment for more detail
| -rw-r--r-- | depends/packages/fontconfig.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/depends/packages/fontconfig.mk b/depends/packages/fontconfig.mk index fb97e0b9e..12695db4b 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 |