diff options
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | lib/libfetch/Makefile | 11 | ||||
| -rw-r--r-- | usr.bin/fetch/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/add/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/create/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/delete/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/info/Makefile | 5 |
7 files changed, 30 insertions, 7 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c75027c..2bf3f6d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -715,7 +715,9 @@ lib/libypclnt__L: lib/librpcsvc__L _generic_libs+= lib .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) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 4308e75..1321118 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -5,16 +5,17 @@ LIB= fetch WARNS?= 4 CFLAGS+= -I. CFLAGS+= -DINET6 -.if !defined(NOCRYPT) -CFLAGS+= -DWITH_SSL -.endif SRCS= fetch.c common.c ftp.c http.c file.c \ ftperr.h httperr.h INCS= fetch.h MAN= fetch.3 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 diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 12746a4..1c372b4 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -4,7 +4,7 @@ MAINTAINER= des@freebsd.org PROG= fetch DPADD= ${LIBFETCH} LDADD= -lfetch -.if !defined(NOCRYPT) +.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) DPADD+= ${LIBCRYPTO} ${LIBSSL} LDADD+= -lcrypto -lssl .endif diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index b72511a..5903eaa 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -10,4 +10,9 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd +.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +DPADD+= ${LIBCRYPTO} ${LIBSSL} +LDADD+= -lcrypto -lssl +.endif + .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index 5bf59f0..2a3dd6b 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -10,4 +10,9 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd +.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +DPADD+= ${LIBCRYPTO} ${LIBSSL} +LDADD+= -lcrypto -lssl +.endif + .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index f08fcc4..4ebf633 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -10,4 +10,9 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd +.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +DPADD+= ${LIBCRYPTO} ${LIBSSL} +LDADD+= -lcrypto -lssl +.endif + .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index bc90013..cd6230d 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -10,4 +10,9 @@ WARNS?= 2 DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd +.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +DPADD+= ${LIBCRYPTO} ${LIBSSL} +LDADD+= -lcrypto -lssl +.endif + .include <bsd.prog.mk> |
