From 7b4292f2f8155b50deb66f07bda689ef9537fa74 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 3 Oct 2010 05:07:05 +1100 Subject: [PATCH] bugfix for glib on OS X: libiconv test applies to 32-bit versions also --- src/{glib-3-apple-lp64-iconv.patch => glib-3-apple-iconv.patch} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/{glib-3-apple-lp64-iconv.patch => glib-3-apple-iconv.patch} (86%) diff --git a/src/glib-3-apple-lp64-iconv.patch b/src/glib-3-apple-iconv.patch similarity index 86% rename from src/glib-3-apple-lp64-iconv.patch rename to src/glib-3-apple-iconv.patch index 99cbbfd3..c1c4c535 100644 --- a/src/glib-3-apple-lp64-iconv.patch +++ b/src/glib-3-apple-iconv.patch @@ -12,7 +12,7 @@ diff -urN glib-2.25.17.orig/glib/gconvert.c glib-2.25.17/glib/gconvert.c #error GNU libiconv in use but included iconv.h not from libiconv #endif -#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) -+#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !(defined(__APPLE__) && defined(__LP64__)) ++#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__) #error GNU libiconv not in use but included iconv.h is from libiconv #endif