Date: Sat, 18 Apr 2009 06:03:10 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r191240 - in head/usr.bin: cpio tar Message-ID: <200904180603.n3I63ADv057511@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Sat Apr 18 06:03:09 2009 New Revision: 191240 URL: http://svn.freebsd.org/changeset/base/191240 Log: Make -lcrypto usage dependent on whether or not we're building with OpenSSL. Modified: head/usr.bin/cpio/Makefile head/usr.bin/tar/Makefile Modified: head/usr.bin/cpio/Makefile ============================================================================== --- head/usr.bin/cpio/Makefile Sat Apr 18 06:01:55 2009 (r191239) +++ head/usr.bin/cpio/Makefile Sat Apr 18 06:03:09 2009 (r191240) @@ -9,7 +9,10 @@ WARNS?= 6 DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" 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" SYMLINKS=bsdcpio ${BINDIR}/cpio Modified: head/usr.bin/tar/Makefile ============================================================================== --- head/usr.bin/tar/Makefile Sat Apr 18 06:01:55 2009 (r191239) +++ head/usr.bin/tar/Makefile Sat Apr 18 06:03:09 2009 (r191240) @@ -1,11 +1,15 @@ # $FreeBSD$ +.include <bsd.own.mk> PROG= bsdtar 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 WARNS?= 5 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+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -I${.CURDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904180603.n3I63ADv057511>