[PATCH] fontconfig: fc-arch: Support fat builds (OSX) so the cache isn't detected as corrupt when switching archs

Jeremy Huddleston jeremyhu at freedesktop.org
Thu Feb 19 13:40:16 PST 2009


I don't have commit access to fontconfig, so could some else please  
push this?  Without it, fontconfig uses the same cache files for  
different archs (and sees the cache as corrupt when switching archs).

Resolves: https://bugs.freedesktop.org/show_bug.cgi?id=20208
---
  fc-arch/fc-arch.c |   14 ++++++++++++++
  1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/fc-arch/fc-arch.c b/fc-arch/fc-arch.c
index 2fa6b18..1766bb1 100644
--- a/fc-arch/fc-arch.c
+++ b/fc-arch/fc-arch.c
@@ -92,6 +92,20 @@ main (int argc, char **argv)

      if (strcmp (arch, "auto") == 0)
      {
+#if defined(__APPLE__) && defined(__MACH__)
+	printf(
+		"#if defined(__ppc__)\n"
+		"#define FC_ARCHITECTURE \"ppc\"\n"
+		"#elif defined(__ppc64__)\n"
+		"#define FC_ARCHITECTURE \"ppc64\"\n"
+		"#elif defined(__i386__)\n"
+		"#define FC_ARCHITECTURE \"x86\"\n"
+		"#elif defined(__x86_64__)\n"
+		"#define FC_ARCHITECTURE \"x86-64\"\n"
+		"#endif\n");
+	fflush (stdout);
+	exit (ferror (stdout));
+#endif
  	arch = NULL;
  	/*
  	 * Search for signature
-- 
1.6.1.2




More information about the xorg-devel mailing list