Date: Thu, 26 Sep 2013 17:55:36 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255893 - head/lib/libarchive Message-ID: <201309261755.r8QHtaiW073660@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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*} != "" || \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309261755.r8QHtaiW073660>