Skip to content

Commit 3498a8d

Browse files
committed
depends: fix fontconfig with newer glibc
See comment for more detail
1 parent 0b01935 commit 3498a8d

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

depends/packages/fontconfig.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ define $(package)_config_cmds
1313
$($(package)_autoconf)
1414
endef
1515

16+
# 2.12.1 uses CHAR_WIDTH which is reserved and clashes with some glibc versions, but newer versions of fontconfig
17+
# have broken makefiles which needlessly attempt to re-generate headers with gperf.
18+
# Instead, change all uses of CHAR_WIDTH, and disable the rule that forces header re-generation.
19+
# This can be removed once the upstream build is fixed.
1620
define $(package)_build_cmds
21+
sed -i 's/CHAR_WIDTH/CHARWIDTH/g' fontconfig/fontconfig.h src/fcobjshash.gperf src/fcobjs.h src/fcobjshash.h && \
22+
sed -i 's/fcobjshash.h: fcobjshash.gperf/fcobjshash.h:/' src/Makefile && \
1723
$(MAKE)
1824
endef
1925

0 commit comments

Comments
 (0)