d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make -lcrypto usage dependent on whether or not we're building with OpenSSL.

Browse Source
This commit is contained in:
kientzle 2009-04-18 06:03:09 +00:00
parent 7d9a6f5de1
commit 392ab3c6f7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/cpio/Makefile
View File

@ -9,7 +9,10 @@ WARNS?= 6
DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
LDADD+= -larchive -lz -lbz2 -lmd -lcrypto LDADD+= -larchive -lz -lbz2 -lmd
.if ${MK_OPENSSL} != "no"
LDADD+= -lcrypto
.endif
.if ${MK_GNU_CPIO} != "yes" .if ${MK_GNU_CPIO} != "yes"
SYMLINKS=bsdcpio ${BINDIR}/cpio SYMLINKS=bsdcpio ${BINDIR}/cpio

6
usr.bin/tar/Makefile
View File

@ -1,11 +1,15 @@
# $FreeBSD$ # $FreeBSD$
.include <bsd.own.mk>
PROG= bsdtar PROG= bsdtar
BSDTAR_VERSION_STRING=2.7.0 BSDTAR_VERSION_STRING=2.7.0
SRCS= bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c SRCS= bsdtar.c cmdline.c getdate.c matching.c read.c siginfo.c subst.c tree.c util.c write.c
WARNS?= 5 WARNS?= 5
DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
LDADD= -larchive -lbz2 -lz -lmd -lcrypto LDADD= -larchive -lbz2 -lz -lmd
.if ${MK_OPENSSL} != "no"
LDADD+= -lcrypto
.endif
CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}