mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Fix build if libiconv is installed.

Browse Source 
PR:		ports/186295
Submitted by:	Olaf Zaplinski <oz42@oz42.eu> (PR submitter)
		Tijl Coosemans <tijl@coosemans.org> (patch submitter)
This commit is contained in:
Koop Mast 2014-02-08 09:26:43 +00:00
parent dcf4c9f850
commit 035af6f927
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343312
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/glib20/files/patch-glib_gconvert.c Normal file
View File

@ -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