Date: Thu, 6 Jun 2002 13:46:37 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Dag-Erling Smorgrav <des@FreeBSD.org>, Bruce Evans <bde@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/fetch Makefile src/lib/libfetch Makefile Message-ID: <20020606104637.GA7253@sunbay.com> In-Reply-To: <20020606093252.C9335-100000@gamplex.bde.org> References: <200206052125.g55LPXU65639@freefall.freebsd.org> <20020606093252.C9335-100000@gamplex.bde.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Thu, Jun 06, 2002 at 09:34:48AM +1000, Bruce Evans wrote:
> On Wed, 5 Jun 2002, Dag-Erling Smorgrav wrote:
>
> > des 2002/06/05 14:25:33 PDT
> >
> > Modified files:
> > usr.bin/fetch Makefile
> > lib/libfetch Makefile
> > Log:
> > 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.
>
> Just add lib{crypto,ssl} to _prebuild_libs near libssh in src/Makefile.inc1?
>
Not that simple, but yes, you should have run src/tools/make_libdeps.sh.
I'm currently testing this patch and will commit it if the test succeeds:
%%%
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.289
diff -u -p -r1.289 Makefile.inc1
--- Makefile.inc1 31 May 2002 13:04:09 -0000 1.289
+++ Makefile.inc1 6 Jun 2002 10:43:54 -0000
@@ -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
Index: lib/libfetch/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libfetch/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- lib/libfetch/Makefile 5 Jun 2002 21:35:35 -0000 1.29
+++ lib/libfetch/Makefile 6 Jun 2002 10:43:54 -0000
@@ -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
Index: usr.bin/fetch/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/fetch/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- usr.bin/fetch/Makefile 5 Jun 2002 21:28:47 -0000 1.8
+++ usr.bin/fetch/Makefile 6 Jun 2002 10:43:54 -0000
@@ -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
Index: usr.sbin/pkg_install/add/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/add/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- usr.sbin/pkg_install/add/Makefile 10 Oct 2001 06:58:41 -0000 1.14
+++ usr.sbin/pkg_install/add/Makefile 6 Jun 2002 10:43:54 -0000
@@ -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>
Index: usr.sbin/pkg_install/create/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/create/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- usr.sbin/pkg_install/create/Makefile 10 Oct 2001 06:58:41 -0000 1.14
+++ usr.sbin/pkg_install/create/Makefile 6 Jun 2002 10:43:54 -0000
@@ -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>
Index: usr.sbin/pkg_install/delete/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/delete/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- usr.sbin/pkg_install/delete/Makefile 10 Oct 2001 06:58:41 -0000 1.14
+++ usr.sbin/pkg_install/delete/Makefile 6 Jun 2002 10:43:54 -0000
@@ -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>
Index: usr.sbin/pkg_install/info/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/pkg_install/info/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- usr.sbin/pkg_install/info/Makefile 10 Oct 2001 06:58:42 -0000 1.14
+++ usr.sbin/pkg_install/info/Makefile 6 Jun 2002 10:43:54 -0000
@@ -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>
%%%
--
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE8/z2NUkv4P6juNwoRAiNLAJ9Q0A7mfCOxzoNaHJkCJsB2PREuHwCeMO0O
rWwnJcy6JjuK2bqCyzmC23o=
=ep7O
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020606104637.GA7253>