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

- Properly build both crypto and non-crypto versions of the

Browse Source 
package management tools.

- Drop redundant dependency of pkg_create(1) and pkg_delete(1)
  on crypto libraries now that they do not link with libfetch.
This commit is contained in:
Ruslan Ermilov 2004-01-17 13:41:16 +00:00
parent f475384e4e
commit d82881651b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=124633
9 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secure/Makefile
View File

@ -4,7 +4,7 @@ SUBDIR= lib libexec usr.bin usr.sbin
# These are programs which depend on crypto, but not Kerberos.
SPROGS= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
lib/libfetch usr.bin/fetch \
lib/libfetch usr.bin/fetch usr.sbin/pkg_install \
lib/libtelnet libexec/telnetd usr.bin/telnet
.if !defined(NO_SENDMAIL)
SPROGS+=usr.sbin/sendmail

5
usr.sbin/pkg_install/Makefile
View File

@ -1,10 +1,9 @@
# $FreeBSD$
SUBDIR= lib add create delete info version
SUBDIR= lib add create delete info ${_sign} version
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
SUBDIR+= sign
_sign= sign
.endif
.include <bsd.subdir.mk>

7
usr.sbin/pkg_install/Makefile.inc
View File

@ -6,6 +6,13 @@ LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a
LIBINSTALL= ${.CURDIR}/../lib/libinstall.a
.endif
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && \
defined(LDADD) && ${LDADD:M-lfetch} != ""
DISTRIBUTION= crypto
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
# Inherit BINDIR from one level up.
.if exists(${.CURDIR}/../../Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc"

5
usr.sbin/pkg_install/add/Makefile
View File

@ -10,9 +10,4 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
.include <bsd.prog.mk>

5
usr.sbin/pkg_install/create/Makefile
View File

@ -10,9 +10,4 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBMD}
LDADD= ${LIBINSTALL} -lmd
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
.include <bsd.prog.mk>

5
usr.sbin/pkg_install/delete/Makefile
View File

@ -10,9 +10,4 @@ WARNS?= 4
DPADD= ${LIBINSTALL} ${LIBMD}
LDADD= ${LIBINSTALL} -lmd
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
.include <bsd.prog.mk>

5
usr.sbin/pkg_install/info/Makefile
View File

@ -10,9 +10,4 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
.include <bsd.prog.mk>

1
usr.sbin/pkg_install/sign/Makefile
View File

@ -7,6 +7,7 @@ MLINKS= pkg_sign.1 pkg_check.1
SRCS= main.c check.c common.c gzip.c pgp_check.c pgp_sign.c \
sha1.c sign.c stand.c x509.c
DISTRIBUTION= crypto
DPADD= ${LIBINSTALL} ${LIBCRYPTO}
LDADD= ${LIBINSTALL} -lcrypto

5
usr.sbin/pkg_install/version/Makefile
View File

@ -10,11 +10,6 @@ WARNS?= 2
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
LDADD= ${LIBINSTALL} -lfetch -lmd
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
test:
./test-pkg_version.sh