diff options
| author | delphij <delphij@FreeBSD.org> | 2013-09-26 17:55:36 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-09-26 17:55:36 +0000 |
| commit | de2d546a38d24abf8a4cd30b11d6e4cda586f539 (patch) | |
| tree | 27e2c0e56bbc04e7840b34f23831a65195589968 /lib | |
| parent | 1dc85910546bedced4f5caca6da78dd02e326f4f (diff) | |
| download | FreeBSD-src-de2d546a38d24abf8a4cd30b11d6e4cda586f539.zip FreeBSD-src-de2d546a38d24abf8a4cd30b11d6e4cda586f539.tar.gz | |
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)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libarchive/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index ac85bba..eb39219 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -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*} != "" || \ |
