On 09/12/11 07:18, Jon TURNEY wrote:
Since the cache files produced by fc-cache are arch-dependent, there is
no point in running fc-cache if cross-compiling
So, even if we aren't using a DESTDIR, but are installing directly into
(a hopefully non-default) prefix, don't run fc-cache when cross-compiling
(Particularly, this avoids running fc-cache when cross-compiling following
the instructions at [1])
[1] http://www.x.org/wiki/CrossCompilingXorg
Signed-off-by: Jon TURNEY<[email protected]>
---
fontutil.m4.in | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fontutil.m4.in b/fontutil.m4.in
index b2b9bd8..f040e19 100644
--- a/fontutil.m4.in
+++ b/fontutil.m4.in
@@ -160,15 +160,16 @@ AC_DEFUN([XORG_FONT_REQUIRED_PROG],[
#
# Set FCCACHE to path to fc-cache (fontconfig cache builder) if found
# Set RUN_FCCACHE to a rule suitable for substituting into a makefile
-# to run fc-cache if found and not installing to $DESTDIR
+# to run fc-cache if found and not installing to $DESTDIR and not
+# cross-compiling
#
# fc-cache is optional, not required, and should be skipped when making
-# packages (installing to $DESTDIR).
+# packages (installing to $DESTDIR) or cross-compiling
#
AC_DEFUN([XORG_FONT_FCCACHE],[
AC_PATH_PROG(FCCACHE, fc-cache)
FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate
this file manually on host system using fc-cache"'
- if test x"$FCCACHE" = x ; then
+ if test x"$FCCACHE" = x || test x"$cross_compiling" != x"no" ; then
RUN_FCCACHE="${FCCACHE_WARN}"
else
RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE)
$(fontdir); $(FCCACHE) $(fontdir); else'
Reviewed-by: Alan Coopersmith <[email protected]>
--
-Alan Coopersmith- [email protected]
Oracle Solaris Platform Engineering: X Window System
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
