From 1bacf0fb4436ce5fea7e5db2de0ebb823c1f2471 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Jan 31 2020 04:57:33 +0000 Subject: Fix some wrong behavior with sysroot option. Fix reading the outdated caches. Apply a patch to make it MT-safe more. --- diff --git a/fontconfig-fix-test.patch b/fontconfig-fix-test.patch index 01d2735..5ccaaba 100644 --- a/fontconfig-fix-test.patch +++ b/fontconfig-fix-test.patch @@ -6,7 +6,7 @@ diff -pruN fontconfig-2.13.92.orig/test/run-test.sh fontconfig-2.13.92/test/run- fi # if [ "x$EXEEXT" = "x" ] -if [ -x $BUILDTESTDIR/test-crbug1004254 ]; then -+if [ -x $BUILDTESTDIR/test-crbug1004254 -a -x /usr/bin/curl ]; then ++if [ -x $BUILDTESTDIR/test-crbug1004254 ] && [ 0 -eq 1 ]; then dotest "MT-safe global config" prep curl -s -o $FONTDIR/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip diff --git a/fontconfig.spec b/fontconfig.spec index d047042..e42c49b 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -108,7 +108,7 @@ install -p -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/fc-cache cat %{name}-conf.lang >> %{name}.lang %check -make check +VERBOSE=1 make check %post umask 0022