diff options
| author | des <des@FreeBSD.org> | 2002-06-05 21:25:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-05 21:25:33 +0000 |
| commit | 694ae4fc45588445f667322288d730f7c990fae6 (patch) | |
| tree | 5712cf527f0fa30f64191a0dbd6e38696cb6b33d | |
| parent | 7f7b291518b00d350eb19be5613ba5f44dea5db9 (diff) | |
| download | FreeBSD-src-694ae4fc45588445f667322288d730f7c990fae6.zip FreeBSD-src-694ae4fc45588445f667322288d730f7c990fae6.tar.gz | |
During buildworld, "regular" libraries are built before crypto stuff, so
libfetch can't depend on lib{crypto,ssl}. Move the dependency to fetch
until we can figure out how to fix this.
| -rw-r--r-- | lib/libfetch/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/fetch/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index b99388d..5c6587a 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -10,8 +10,8 @@ SRCS= fetch.c common.c ftp.c http.c file.c \ INCS= fetch.h MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -DPADD= ${LIBCRYPTO} ${LIBSSL} -LDADD= -lcrypto -lssl +#DPADD= ${LIBCRYPTO} ${LIBSSL} +#LDADD= -lcrypto -lssl NO_WERROR= yes diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 56754a0..06b0fa8 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -4,5 +4,9 @@ MAINTAINER= des@freebsd.org PROG= fetch DPADD= ${LIBFETCH} LDADD= -lfetch +.if !defined(NOCRYPTO) +DPADD+= ${LIBCRYPTO} ${LIBSSL} +LDADD+= -lcrypto -lssl +.endif .include <bsd.prog.mk> |
