[90994] trunk/dports/graphics/fontconfig
ryandesign at macports.org
ryandesign at macports.org
Tue Mar 20 17:44:17 PDT 2012
Revision: 90994
https://trac.macports.org/changeset/90994
Author: ryandesign at macports.org
Date: 2012-03-20 17:44:16 -0700 (Tue, 20 Mar 2012)
Log Message:
-----------
fontconfig: update to 2.9.0; use correct X11 fonts dir on Leopard and later; use unversioned docdir
Modified Paths:
--------------
trunk/dports/graphics/fontconfig/Portfile
Added Paths:
-----------
trunk/dports/graphics/fontconfig/files/0001-fcarch-Restrict-FC_ARCHITECTURE-usage-to-fcarch.h.diff
trunk/dports/graphics/fontconfig/files/0002-fcarch-Check-for-architecture-type-at-runtime.diff
Removed Paths:
-------------
trunk/dports/graphics/fontconfig/files/arch.patch
Modified: trunk/dports/graphics/fontconfig/Portfile
===================================================================
--- trunk/dports/graphics/fontconfig/Portfile 2012-03-20 23:48:47 UTC (rev 90993)
+++ trunk/dports/graphics/fontconfig/Portfile 2012-03-21 00:44:16 UTC (rev 90994)
@@ -6,7 +6,7 @@
PortGroup archcheck 1.0
name fontconfig
-version 2.8.0
+version 2.9.0
categories graphics
maintainers ryandesign
license fontconfig
@@ -21,9 +21,8 @@
master_sites ${homepage}release/
-checksums md5 77e15a92006ddc2adbb06f840d591c0e \
- sha1 570fb55eb14f2c92a7b470b941e9d35dbfafa716 \
- rmd160 fefee412cad4fa71b573e997e14f1df12f439be2
+checksums rmd160 9456d0ab2ae72086ec3edce9d72e007e2bf9bf1e \
+ sha256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
depends_lib port:libiconv \
port:expat \
@@ -33,13 +32,22 @@
lib/libexpat.dylib \
lib/libfreetype.dylib
-set add_fonts /usr/X11R6/lib/X11/fonts
-set docdir ${prefix}/share/doc/${name}-${version}
+if {${os.platform} == "darwin" && ${os.major} < 9} {
+ set add_fonts /usr/X11R6/lib/X11/fonts
+} else {
+ set add_fonts /usr/X11/lib/X11/fonts
+}
+set docdir ${prefix}/share/doc/${name}
configure.args --with-docdir=${docdir}
-patchfiles arch.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=20208
+patch.pre_args -p1
+patchfiles 0001-fcarch-Restrict-FC_ARCHITECTURE-usage-to-fcarch.h.diff \
+ 0002-fcarch-Check-for-architecture-type-at-runtime.diff
+use_autoreconf yes
+
# We put this into a pre-configure so it can be evaluated _after_ variants selection.
pre-configure {
configure.args-append --with-add-fonts=[join ${add_fonts} ,]
Added: trunk/dports/graphics/fontconfig/files/0001-fcarch-Restrict-FC_ARCHITECTURE-usage-to-fcarch.h.diff
===================================================================
--- trunk/dports/graphics/fontconfig/files/0001-fcarch-Restrict-FC_ARCHITECTURE-usage-to-fcarch.h.diff (rev 0)
+++ trunk/dports/graphics/fontconfig/files/0001-fcarch-Restrict-FC_ARCHITECTURE-usage-to-fcarch.h.diff 2012-03-21 00:44:16 UTC (rev 90994)
@@ -0,0 +1,235 @@
+From 38543764df4e5f4071ff3e5fa8dc467e0bd26b9e Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Sun, 18 Mar 2012 23:16:36 -0700
+Subject: [PATCH 1/2] fcarch: Restrict FC_ARCHITECTURE usage to fcarch.h
+
+This should have no runtime effect, but it sets the stage for the
+following patch.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ fc-cache/fc-cache.c | 8 ++++++--
+ fc-cat/fc-cat.c | 7 +++++--
+ src/fcarch.c | 41 ++++-------------------------------------
+ src/fcarch.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ src/fccache.c | 7 +++++--
+ 5 files changed, 68 insertions(+), 43 deletions(-)
+
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index d265350..e68ddc1 100644
+--- a/fc-cache/fc-cache.c
++++ b/fc-cache/fc-cache.c
+@@ -258,6 +258,7 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
+ FcBool remove;
+ FcCache *cache;
+ struct stat target_stat;
++ FcChar8 suffix[1 + FC_ARCH_MAX_LEN + sizeof (FC_CACHE_SUFFIX) + 1];
+
+ dir_base = FcStrPlus (dir, (FcChar8 *) "/");
+ if (!dir_base)
+@@ -282,6 +283,9 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
+ FcStrFree (dir_base);
+ return FcFalse;
+ }
++ strcpy((char *)suffix, "-");
++ _FcGetArch(suffix + 1);
++ strlcpy((char *)suffix, FC_CACHE_SUFFIX, sizeof(suffix));
+ while ((ent = readdir (d)))
+ {
+ FcChar8 *file_name;
+@@ -291,8 +295,8 @@ cleanCacheDirectory (FcConfig *config, FcChar8 *dir, FcBool verbose)
+ continue;
+ /* skip cache files for different architectures and */
+ /* files which are not cache files at all */
+- if (strlen(ent->d_name) != 32 + strlen ("-" FC_ARCHITECTURE FC_CACHE_SUFFIX) ||
+- strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX))
++ if (strlen(ent->d_name) != 32 + strlen((char *)suffix) ||
++ strcmp(ent->d_name + 32, (char *)suffix))
+ continue;
+
+ file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name);
+diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
+index c3d6829..af6e859 100644
+--- a/fc-cat/fc-cat.c
++++ b/fc-cat/fc-cat.c
+@@ -149,13 +149,16 @@ static void
+ usage (char *program, int error)
+ {
+ FILE *file = error ? stderr : stdout;
++ FcChar8 arch[FC_ARCH_MAX_LEN + 1];
++
++ _FcGetArch(arch);
+ #if HAVE_GETOPT_LONG
+ fprintf (file, "usage: %s [-rv] [--recurse] [--verbose] [*-%s.cache-2|directory]...\n",
+- program, FC_ARCHITECTURE);
++ program, arch);
+ fprintf (file, " %s [-Vh] [--version] [--help]\n", program);
+ #else
+ fprintf (file, "usage: %s [-rvVh] [*-%s.cache-2|directory]...\n",
+- program, FC_ARCHITECTURE);
++ program, arch);
+ #endif
+ fprintf (file, "Reads font information cache from:\n");
+ fprintf (file, " 1) specified fontconfig cache file\n");
+diff --git a/src/fcarch.c b/src/fcarch.c
+index c69397e..7df2e3e 100644
+--- a/src/fcarch.c
++++ b/src/fcarch.c
+@@ -27,47 +27,14 @@
+ #include <config.h>
+ #endif
+
+-/* If architecture is hardcoded, skip the assert tests */
+-
+-#ifndef FC_ARCHITECTURE
+-
+ #include "fcarch.h"
+
+-/* Make sure the cache structure is consistent with what we expect */
+-
+-#include "fcint.h"
+-
+-FC_ASSERT_STATIC (1 == sizeof (char));
+-FC_ASSERT_STATIC (2 == sizeof (FcChar16));
+-FC_ASSERT_STATIC (4 == sizeof (int));
+-FC_ASSERT_STATIC (4 == sizeof (FcChar32));
+-FC_ASSERT_STATIC (4 == sizeof (FcObject));
+-FC_ASSERT_STATIC (4 == sizeof (FcValueBinding));
+-FC_ASSERT_STATIC (8 == sizeof (FcAlign));
+-FC_ASSERT_STATIC (0x20 == sizeof (FcCharLeaf));
+-
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (intptr_t));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcPatternEltPtr));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcValueListPtr));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (char *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (struct FcPatternElt *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcValueList *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
+-
+-FC_ASSERT_STATIC (0x08 + 1*ALIGNOF_DOUBLE == sizeof (FcValue));
+-FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt));
+-FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));
+-FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet));
+-FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
+-
+-#endif
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+- printf ("%s\n", FC_ARCHITECTURE);
++ FcChar8 arch[FC_ARCH_MAX_LEN + 1];
++
++ _FcGetArch(arch);
++ printf ("%s\n", arch);
+ return 0;
+ }
+diff --git a/src/fcarch.h b/src/fcarch.h
+index 9cabf04..8695933 100644
+--- a/src/fcarch.h
++++ b/src/fcarch.h
+@@ -27,6 +27,36 @@
+ #include <config.h>
+ #endif
+
++#include "fcint.h"
++
++#ifndef FC_ARCHITECTURE
++/* Make sure the cache structure is consistent with what we expect */
++FC_ASSERT_STATIC (1 == sizeof (char));
++FC_ASSERT_STATIC (2 == sizeof (FcChar16));
++FC_ASSERT_STATIC (4 == sizeof (int));
++FC_ASSERT_STATIC (4 == sizeof (FcChar32));
++FC_ASSERT_STATIC (4 == sizeof (FcObject));
++FC_ASSERT_STATIC (4 == sizeof (FcValueBinding));
++FC_ASSERT_STATIC (8 == sizeof (FcAlign));
++FC_ASSERT_STATIC (0x20 == sizeof (FcCharLeaf));
++
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (intptr_t));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcPatternEltPtr));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcValueListPtr));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (char *));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (struct FcPatternElt *));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcValueList *));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
++FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
++
++FC_ASSERT_STATIC (0x08 + 1*ALIGNOF_DOUBLE == sizeof (FcValue));
++FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt));
++FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));
++FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet));
++FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
++#endif
++
+ /*
+ * Each unique machine architecture needs an entry in this file
+ * So far the differences boil down to: endianness, 32 vs 64 bit pointers,
+@@ -46,6 +76,19 @@
+ * be64 1234 8 8
+ */
+
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++/* Returns 0 on success or an errno on failure.
++ * buffer must be non-NULL and point to a character buffer with at least
++ * FC_ARCH_MAX_LEN + 1 bytes available.
++ */
++#define FC_ARCH_MAX_LEN 6
++static inline int _FcGetArch(FcChar8 *buffer) {
++ if (buffer == NULL)
++ return EINVAL;
++
+ #if defined(WORDS_BIGENDIAN) && WORDS_BIGENDIAN
+ # define FC_ARCH_ENDIAN "be"
+ #else /* !WORDS_BIGENDIAN */
+@@ -67,4 +110,9 @@
+ # define FC_ARCHITECTURE FC_ARCH_ENDIAN FC_ARCH_SIZE_ALIGN
+ #endif
+
++ snprintf((char *) buffer, FC_ARCH_MAX_LEN + 1, "%s", FC_ARCHITECTURE);
++
++ return 0;
++}
++
+ #endif /* _FCARCH_H_ */
+diff --git a/src/fccache.c b/src/fccache.c
+index d8102d7..783e54a 100644
+--- a/src/fccache.c
++++ b/src/fccache.c
+@@ -57,7 +57,7 @@ static void MD5Update(struct MD5Context *ctx, const unsigned char *buf, unsigned
+ static void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
+ static void MD5Transform(FcChar32 buf[4], FcChar32 in[16]);
+
+-#define CACHEBASE_LEN (1 + 32 + 1 + sizeof (FC_ARCHITECTURE) + sizeof (FC_CACHE_SUFFIX))
++#define CACHEBASE_LEN (1 + 32 + 1 + FC_ARCH_MAX_LEN + sizeof (FC_CACHE_SUFFIX))
+
+ #ifdef _WIN32
+
+@@ -159,6 +159,7 @@ FcDirCacheBasename (const FcChar8 * dir, FcChar8 cache_base[CACHEBASE_LEN])
+ FcChar8 *hex_hash;
+ int cnt;
+ struct MD5Context ctx;
++ FcChar8 arch[FC_ARCH_MAX_LEN + 1];
+
+ MD5Init (&ctx);
+ MD5Update (&ctx, (const unsigned char *)dir, strlen ((const char *) dir));
+@@ -173,7 +174,9 @@ FcDirCacheBasename (const FcChar8 * dir, FcChar8 cache_base[CACHEBASE_LEN])
+ hex_hash[2*cnt+1] = bin2hex[hash[cnt] & 0xf];
+ }
+ hex_hash[2*cnt] = 0;
+- strcat ((char *) cache_base, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX);
++
++ _FcGetArch(arch);
++ snprintf((char *) cache_base, CACHEBASE_LEN, "-%s%s", arch, FC_CACHE_SUFFIX);
+
+ return cache_base;
+ }
+--
+1.7.9.2
+
Copied: trunk/dports/graphics/fontconfig/files/0002-fcarch-Check-for-architecture-type-at-runtime.diff (from rev 90952, trunk/dports/graphics/fontconfig/files/arch.patch)
===================================================================
--- trunk/dports/graphics/fontconfig/files/0002-fcarch-Check-for-architecture-type-at-runtime.diff (rev 0)
+++ trunk/dports/graphics/fontconfig/files/0002-fcarch-Check-for-architecture-type-at-runtime.diff 2012-03-21 00:44:16 UTC (rev 90994)
@@ -0,0 +1,132 @@
+From 3d2f1071573cc171ceddd796fd911faabc491302 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Sun, 18 Mar 2012 23:21:09 -0700
+Subject: [PATCH 2/2] fcarch: Check for architecture type at runtime rather
+ than build time
+
+https://bugs.freedesktop.org/show_bug.cgi?id=20208
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ configure.in | 2 --
+ src/fcarch.h | 75 ++++++++++++++++++++++++++++++++--------------------------
+ 2 files changed, 42 insertions(+), 35 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3204f2e..41a7d39 100644
+--- a/configure.in
++++ b/configure.in
+@@ -493,8 +493,6 @@ AC_SUBST(DOCMAN3)
+
+ dnl Figure out what cache format suffix to use for this architecture
+ AC_C_BIGENDIAN
+-AC_CHECK_SIZEOF([void *])
+-AC_CHECK_ALIGNOF([double])
+
+
+
+diff --git a/src/fcarch.h b/src/fcarch.h
+index 8695933..0675994 100644
+--- a/src/fcarch.h
++++ b/src/fcarch.h
+@@ -40,23 +40,27 @@ FC_ASSERT_STATIC (4 == sizeof (FcValueBinding));
+ FC_ASSERT_STATIC (8 == sizeof (FcAlign));
+ FC_ASSERT_STATIC (0x20 == sizeof (FcCharLeaf));
+
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (intptr_t));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcPatternEltPtr));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcValueListPtr));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (char *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (struct FcPatternElt *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcValueList *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
+-FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (intptr_t));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (FcPatternEltPtr));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (FcValueListPtr));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (char *));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (struct FcPatternElt *));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (FcValueList *));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (FcStrSet *));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (FcCharLeaf **));
++FC_ASSERT_STATIC (sizeof(void *) == sizeof (FcChar16 *));
+
+-FC_ASSERT_STATIC (0x08 + 1*ALIGNOF_DOUBLE == sizeof (FcValue));
+-FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt));
+-FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));
+-FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet));
+-FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
+-#endif
++FC_ASSERT_STATIC (0x08 + offsetof(struct { char c; double d; }, d) == sizeof (FcValue));
++FC_ASSERT_STATIC (0x00 + 2*sizeof(void *) == sizeof (FcPatternElt));
++FC_ASSERT_STATIC (0x08 + 2*sizeof(void *) == sizeof (FcPattern));
++FC_ASSERT_STATIC (0x08 + 2*sizeof(void *) == sizeof (FcCharSet));
++FC_ASSERT_STATIC (0x08 + 6*sizeof(void *) == sizeof (FcCache));
+
++#ifdef __APPLE__
++#include <machine/endian.h>
++#endif
++#endif
++
+ /*
+ * Each unique machine architecture needs an entry in this file
+ * So far the differences boil down to: endianness, 32 vs 64 bit pointers,
+@@ -86,31 +90,36 @@ FC_ASSERT_STATIC (0x08 + 6*SIZEOF_VOID_P == sizeof (FcCache));
+ */
+ #define FC_ARCH_MAX_LEN 6
+ static inline int _FcGetArch(FcChar8 *buffer) {
++ const char *endian;
++ int ptr_bytes;
++ int dbl_align;
++
+ if (buffer == NULL)
+ return EINVAL;
+
+-#if defined(WORDS_BIGENDIAN) && WORDS_BIGENDIAN
+-# define FC_ARCH_ENDIAN "be"
+-#else /* !WORDS_BIGENDIAN */
+-# define FC_ARCH_ENDIAN "le"
+-#endif
++#ifdef FC_ARCHITECTURE
++ /* If FC_ARCHITECTURE is set, use it */
++ snprintf((char *) buffer, FC_ARCH_MAX_LEN + 1, "%s", FC_ARCHITECTURE);
++#else
+
+-#if SIZEOF_VOID_P == 4
+-# if ALIGNOF_DOUBLE == 4
+-# define FC_ARCH_SIZE_ALIGN "32d4"
+-# else /* ALIGNOF_DOUBLE != 4 */
+-# define FC_ARCH_SIZE_ALIGN "32d8"
+-# endif
+-#else /* SIZEOF_VOID_P != 4 */
+-# define FC_ARCH_SIZE_ALIGN "64"
++#if defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
++ endian = "le";
++#elif defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
++ endian = "be";
++#elif defined(__DARWIN_BYTE_ORDER) && __DARWIN_BYTE_ORDER == __DARWIN_PDP_ENDIAN
++ endian = "pe";
++#elif defined(WORDS_BIGENDIAN) && WORDS_BIGENDIAN
++ /* Fallback on what configure tells us */
++ endian = "be";
++#else
++ endian = "le";
+ #endif
+
+-/* config.h might override this */
+-#ifndef FC_ARCHITECTURE
+-# define FC_ARCHITECTURE FC_ARCH_ENDIAN FC_ARCH_SIZE_ALIGN
+-#endif
++ ptr_bytes = 8 * sizeof(void *);
++ dbl_align = offsetof(struct { char c; double d; }, d);
+
+- snprintf((char *) buffer, FC_ARCH_MAX_LEN + 1, "%s", FC_ARCHITECTURE);
++ snprintf((char *) buffer, FC_ARCH_MAX_LEN + 1, "%s%dd%d", endian, ptr_bytes, dbl_align);
++#endif
+
+ return 0;
+ }
+--
+1.7.9.2
+
Deleted: trunk/dports/graphics/fontconfig/files/arch.patch
===================================================================
--- trunk/dports/graphics/fontconfig/files/arch.patch 2012-03-20 23:48:47 UTC (rev 90993)
+++ trunk/dports/graphics/fontconfig/files/arch.patch 2012-03-21 00:44:16 UTC (rev 90994)
@@ -1,23 +0,0 @@
---- fc-arch/fc-arch.c 2006-09-04 06:37:14.000000000 +0800
-+++ fc-arch/fc-arch.c 2009-02-19 10:48:05.000000000 +0900
-@@ -92,6 +92,20 @@
-
- if (strcmp (arch, "auto") == 0)
- {
-+#if defined(__APPLE__) && defined(__MACH__)
-+ printf(
-+ "#if defined(__ppc__)\n"
-+ "#define FC_ARCHITECTURE \"m68k\"\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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120320/81c91032/attachment-0001.html>
More information about the macports-changes
mailing list