diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-03 15:07:00 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-03 15:07:10 +0200 |
| commit | e222618a32a16cf0efae392e6349c10c38e57db6 (patch) | |
| tree | 017b4d0cfa2089f97cc0271fc18fc5812e7aeb9a | |
| parent | 2e857bb619f52fbd0de3f61bd6d40497d7c74fcf (diff) | |
| parent | 3498a8d018fa02de17e1f9c4cda49f4c7edb3c6c (diff) | |
| download | bitcoin-e222618a32a16cf0efae392e6349c10c38e57db6.tar.xz | |
Merge #10851: depends: fix fontconfig with newer glibc
3498a8d depends: fix fontconfig with newer glibc (Cory Fields)
Pull request description:
Fixes build with newer gcc.
Without this, depends builds fail with gcc7, maybe gcc6.
Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74
| -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 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 |