From 9a26b427fb939a3f836b3b2c4306a7a5c5435f07 Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Mon, 25 Sep 2017 22:52:52 +0100 Subject: [PATCH 1/2] Don't set PKG_CONFIG_SYSROOT_DIR env variable to build Qt. Setting PKG_CONFIG_SYSROOT_DIR environment variable to "/" for building Qt makes pkgconf behave strange (remove "/" prefix instead of adding it). And it makes no sense to set this variable for old pkgconfig anyway. Signed-off-by: Oleg Girko --- depends/packages/qt.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index bbfdb766e..d5354c6bf 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -150,7 +150,6 @@ define $(package)_preprocess_cmds endef define $(package)_config_cmds - export PKG_CONFIG_SYSROOT_DIR=/ && \ export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \ export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \ ./configure $($(package)_config_opts) && \ From 8ee652f4c39f02de982f98a7cc36653c6f5a606c Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 3 Aug 2017 15:07:00 +0200 Subject: [PATCH 2/2] 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 --- depends/packages/fontconfig.mk | 6 ++++++ 1 file changed, 6 insertions(+) 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