diff options
Diffstat (limited to 'lib/libarchive/Makefile')
| -rw-r--r-- | lib/libarchive/Makefile | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index b7e9d7f..9dfad77 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -4,19 +4,9 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIB= archive -DPADD= ${LIBZ} -LDADD= -lz -DPADD+= ${LIBBZ2} -LDADD+= -lbz2 -CFLAGS+= -DHAVE_BZLIB_H=1 - -DPADD+= ${LIBLZMA} -LDADD+= -llzma -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 - -DPADD+= ${LIBBSDXML} -LDADD+= -lbsdxml +LIBADD= z bz2 lzma bsdxml +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -27,17 +17,15 @@ CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .else -DPADD+= ${LIBMD} -LDADD+= -lmd +LIBADD+= md .endif .if ${MK_ICONV} != "no" # 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 +SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ |
