svn commit: r255893 - head/lib/libarchive

[Xin LI]

Author: delphij
Date: Thu Sep 26 17:55:36 2013
New Revision: 255893
URL: http://svnweb.freebsd.org/changeset/base/255893

Log:
  Temporarily disable iconv for non-shared library builds.  The dynamic
  loading of conversation table is not yet compatible with static builds.
  
  Approved by:	re (gjb)

Modified:
  head/lib/libarchive/Makefile

Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile	Thu Sep 26 17:55:04 2013	(r255892)
+++ head/lib/libarchive/Makefile	Thu Sep 26 17:55:36 2013	(r255893)
@@ -35,7 +35,9 @@ LDADD+=	-lmd
 .endif
 
 .if ${MK_ICONV} != "no"
-CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
+# TODO: This can be changed back to CFLAGS once iconv works correctly
+# with statically linked binaries.
+SHARED_CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
 .endif
 
 .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \