From owner-freebsd-current Sun Aug 6 02:19:11 1995 Return-Path: current-owner Received: (from majordom@localhost) by freefall.cdrom.com (8.6.11/8.6.6) id CAA01853 for current-outgoing; Sun, 6 Aug 1995 02:19:11 -0700 Received: from grunt.grondar.za (grunt.grondar.za [196.7.18.129]) by freefall.cdrom.com (8.6.11/8.6.6) with ESMTP id CAA01844 for ; Sun, 6 Aug 1995 02:18:52 -0700 Received: from grumble.grondar.za (grumble.grondar.za [196.7.18.130]) by grunt.grondar.za (8.6.11/8.6.9) with ESMTP id LAA01202; Sun, 6 Aug 1995 11:17:57 +0200 Received: from localhost (localhost [127.0.0.1]) by grumble.grondar.za (8.6.11/8.6.9) with SMTP id LAA09271; Sun, 6 Aug 1995 11:17:54 +0200 Message-Id: <199508060917.LAA09271@grumble.grondar.za> X-Authentication-Warning: grumble.grondar.za: Host localhost didn't use HELO protocol To: "Rodney W. Grimes" cc: mark@grondar.za (Mark Murray), ache@astral.msk.su, current@freefall.cdrom.com, jkh@time.cdrom.com Subject: Re: current make world falls over. Date: Sun, 06 Aug 1995 11:17:53 +0200 From: Mark Murray Sender: current-owner@FreeBSD.org Precedence: bulk > > > That is a bug in src/Makefile. In the lib: target we need to pickup > > > secure/lib/libtelnet if we are infact building the secure bits. > > > > > > Please create a patch and submit it to me for review. > > > > Here are the proposed patches: > > This looks okay for part of the solution, but it does not cause > src/Makefile lib: to build secure/lib/libtelnet. That parts is > still missing :-(. This is the bootstrapping issue and why you > have to manually go build secure/lib/libtelnet the first time you > convert to that version of libtelnet. I'm not sure I understand; there is no lib: target in src/Makefile - are you referring to libraries:? In the libraries: target, there is .if exists(secure) && !defined(NOCRYPT) && !defined(NOSECURE) cd ${.CURDIR}/secure/lib && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} .endif .if exists(lib) cd ${.CURDIR}/lib/csu/i386 && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/lib && \ ${MAKE} depend all install ${CLEANDIR} ${OBJDIR} .endif The (secure) gets done _before_ (lib), and without the patches below, the the secure libs were being clobbered by src/lib. secure/Makefile _does_ make libtelnet (the secure version). > > --- lib/Makefile.ORG Fri Aug 4 21:29:34 1995 > > +++ lib/Makefile Sat Aug 5 11:15:40 1995 > > @@ -13,7 +13,11 @@ > > SUBDIR+= libc libcompat libcom_err libcrypt libcurses libedit \ > > libf2c libforms \ > > libkvm libmd libmytinfo libncurses libpcap libresolv librpcsvc \ > > - libscsi libskey libss libtelnet libtermcap libutil liby > > + libscsi libskey libss libtermcap libutil liby > > + > > +.if !exists(../secure) || defined(NOCRYPT) || defined(NOSECURE) > > +SUBDIR+= libtelnet > > +.endif > > > > .if defined(WANT_CSRG_LIBM) > > SUBDIR+= libm > > > > > > --- usr.bin/Makefile.ORG Sat Aug 5 17:20:32 1995 > > +++ usr.bin/Makefile Sat Aug 5 11:20:39 1995 > > @@ -20,11 +20,15 @@ > > printf quota ranlib rdist renice rev rlogin rpcgen \ > > rpcinfo rs rsh rup ruptime rusers rwall \ > > rwho script sed sgmlfmt sgmls shar showmount size soelim split \ > > - strings strip su symorder talk tconv tcopy tee telnet tftp time tip \ > > + strings strip su symorder talk tconv tcopy tee tftp time tip \ > > tn3270 touch tput tr true tset tsort tty ul uname unexpand \ > > unifdef uniq unvis users uudecode uuencode vacation \ > > vgrind vi vis w wall wc what whereis which who whois window \ > > write xargs xinstall xstr yacc yes ypcat ypmatch ypwhich > > + > > +.if !exists(../secure) || defined(NOCRYPT) || defined(NOSECURE) > > +SUBDIR+=telnet > > +.endif > > > > # Cmp, look and tail all use mmap, so new-VM only. > > # F77 and pascal are VAX/Tahoe only. > > > > M > > -- > > Mark Murray > > 46 Harvey Rd, Claremont, Cape Town 7700, South Africa > > +27 21 61-3768 GMT+0200 > > Finger mark@grumble.grondar.za for PGP key > > > > > -- > Rod Grimes rgrimes@gndrsh.aac.dev.com > Accurate Automation Company Reliable computers for FreeBSD -- Mark Murray 46 Harvey Rd, Claremont, Cape Town 7700, South Africa +27 21 61-3768 GMT+0200 Finger mark@grumble.grondar.za for PGP key