summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/glib20/files/patch-glib_gconvert.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/devel/glib20/files/patch-glib_gconvert.c b/devel/glib20/files/patch-glib_gconvert.c
new file mode 100644
index 000000000..8b7e4a4cb
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gconvert.c
@@ -0,0 +1,14 @@
+Work around our situation of having both libiconv in libc and libiconv from
+ports installed.
+
+--- glib/gconvert.c.orig 2014-02-08 10:15:50.000000000 +0100
++++ glib/gconvert.c 2014-02-08 10:16:52.000000000 +0100
+@@ -62,7 +62,7 @@
+ #error GNU libiconv in use but included iconv.h not from libiconv
+ #endif
+ #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
+- && !defined (__APPLE_CC__) && !defined (__LP_64__)
++ && !defined (LIBICONV_PLUG) && !defined (__APPLE_CC__) && !defined (__LP_64__)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+