diff options
| author | kwm <kwm@FreeBSD.org> | 2014-02-08 17:26:43 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2014-02-08 17:26:43 +0800 |
| commit | 62f9d44144a9fd6138caf5b94232cb56f2663fc2 (patch) | |
| tree | 2859b9dc6d86d99bf15c39df96efa4899e604419 /devel/glib20 | |
| parent | 2ce43f520ba526f5fb19e982337acfb8904952a2 (diff) | |
| download | freebsd-ports-gnome-62f9d44144a9fd6138caf5b94232cb56f2663fc2.tar.gz freebsd-ports-gnome-62f9d44144a9fd6138caf5b94232cb56f2663fc2.tar.zst freebsd-ports-gnome-62f9d44144a9fd6138caf5b94232cb56f2663fc2.zip | |
Fix build if libiconv is installed.
PR: ports/186295
Submitted by: Olaf Zaplinski <oz42@oz42.eu> (PR submitter)
Tijl Coosemans <tijl@coosemans.org> (patch submitter)
Diffstat (limited to 'devel/glib20')
| -rw-r--r-- | devel/glib20/files/patch-glib_gconvert.c | 14 |
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 000000000000..8b7e4a4cbd3b --- /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 + |