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

libfetch now depends on libcrypto and libssl.

Browse Source
This commit is contained in:
Ruslan Ermilov 2002-06-06 13:45:46 +00:00
parent e12155c834
commit 4093807dd9
7 changed files with 30 additions and 7 deletions
Makefile.inc1
lib/libfetch
Makefile
usr.bin/fetch
Makefile
usr.sbin/pkg_install
add
Makefile
create
Makefile
delete
Makefile
info
Makefile

4
Makefile.inc1

@ -715,7 +715,9 @@ lib/libypclnt__L: lib/librpcsvc__L
_generic_libs+= lib _generic_libs+= lib
.if !defined(NOCRYPT) && !defined(NOSECURE) .if !defined(NOCRYPT) && !defined(NOSECURE)
_prebuild_libs+= secure/lib/libcrypto .if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
.endif
.if !defined(NO_OPENSSH) .if !defined(NO_OPENSSH)
_prebuild_libs+= secure/lib/libssh _prebuild_libs+= secure/lib/libssh
secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L

11
lib/libfetch/Makefile

@ -5,16 +5,17 @@ LIB= fetch
WARNS?= 4 WARNS?= 4
CFLAGS+= -I. CFLAGS+= -I.
CFLAGS+= -DINET6 CFLAGS+= -DINET6
.if !defined(NOCRYPT)
CFLAGS+= -DWITH_SSL
.endif
SRCS= fetch.c common.c ftp.c http.c file.c \ SRCS= fetch.c common.c ftp.c http.c file.c \
ftperr.h httperr.h ftperr.h httperr.h
INCS= fetch.h INCS= fetch.h
MAN= fetch.3 MAN= fetch.3
CLEANFILES= ftperr.h httperr.h CLEANFILES= ftperr.h httperr.h
#DPADD= ${LIBCRYPTO} ${LIBSSL}
#LDADD= -lcrypto -lssl .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
CFLAGS+= -DWITH_SSL
DPADD= ${LIBCRYPTO} ${LIBSSL}
LDADD= -lcrypto -lssl
.endif
NO_WERROR= yes NO_WERROR= yes

2
usr.bin/fetch/Makefile

@ -4,7 +4,7 @@ MAINTAINER= des@freebsd.org
PROG= fetch PROG= fetch
DPADD= ${LIBFETCH} DPADD= ${LIBFETCH}
LDADD= -lfetch LDADD= -lfetch
.if !defined(NOCRYPT) .if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
DPADD+= ${LIBCRYPTO} ${LIBSSL} DPADD+= ${LIBCRYPTO} ${LIBSSL}
LDADD+= -lcrypto -lssl LDADD+= -lcrypto -lssl
.endif .endif

5
usr.sbin/pkg_install/add/Makefile

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

5
usr.sbin/pkg_install/create/Makefile

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

5
usr.sbin/pkg_install/delete/Makefile

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

5
usr.sbin/pkg_install/info/Makefile

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