diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-08 17:36:30 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-02-08 17:36:30 +0800 |
| commit | 33b5d1ca02febc754e1eb75c3565b2530c3ae43e (patch) | |
| tree | 0dd73cf40d898d76cf68113048136c773f79ef12 /devel/glib20/files | |
| parent | f516167704d9755e0afe273db6d9ef780eddcbbe (diff) | |
| download | marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.tar marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.tar.gz marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.tar.bz2 marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.tar.lz marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.tar.xz marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.tar.zst marcuscom-ports-33b5d1ca02febc754e1eb75c3565b2530c3ae43e.zip | |
Sync with ports.
Allow to build if we using libiconv from libc, and libiconv is installed
(because some ports need it.)
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19005 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20/files')
| -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 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 + |