John!
Could you please try the attached patch and let me know?
I had to move -DRELEASE_CRUNCH to *_fixit.conf so that
${OBJS} are computed correctly for usr.bin/telnet.
On Thu, Mar 29, 2001 at 10:08:50AM +0200, John Hay wrote:
> > On Wed, Mar 28, 2001 at 01:00:59PM +0300, Ruslan Ermilov wrote:
> > [...]
> > > I will commit the changes soon, and will let you know. Actually,
> > > this brokeness is a good argument in favor of this change! :-)
> > >
> > Should be fixed now, commitlog attached.
> >
>
> Yes it is getting past there, but now bombs when trying to build the
> fixit crunch file because it can't find libtelnet. :-) See
> release/fixit_crunch.conf and release/{i386|pc98}/fixit_crunch.conf.
>
> #######
> cc -O -pipe -DCRUNCHED_BINARY -c telnet_stub.c
> ld -dc -r -o telnet.lo telnet_stub.o /usr/obj//usr/src/usr.bin/telnet/authenc.o
>/usr/obj//usr/src/usr.bin/telnet/commands.o /usr/obj//usr/src/usr.bin/telnet/main.o
>/usr/obj//usr/src/usr.bin/telnet/network.o /usr/obj//usr/src/usr.bin/telnet/ring.o
>/usr/obj//usr/src/usr.bin/telnet/sys_bsd.o /usr/obj//usr/src/usr.bin/telnet/telnet.o
>/usr/obj//usr/src/usr.bin/telnet/terminal.o /usr/obj//usr/src/usr.bin/telnet/tn3270.o
>/usr/obj//usr/src/usr.bin/telnet/utilities.o crunchide -k _crunched_telnet_stub
>telnet.lo
> cc -static -o fixit_crunch fixit_crunch.o cat.lo chmod.lo chroot.lo cp.lo dd.lo
>df.lo echo.lo expr.lo kill.lo ln.lo ls.lo mkdir.lo mv.lo rm.lo rmdir.lo sleep.lo
>sync.lo chown.lo clri.lo disklabel.lo dmesg.lo fdisk.lo mknod.lo mount.lo reboot.lo
>restore.lo swapon.lo umount.lo mount_msdos.lo mount_cd9660.lo ftp.lo telnet.lo
>-lcrypt -ltelnet -lutil -ll -lm -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
> /usr/libexec/elf/ld: cannot find -ltelnet
> *** Error code 1
>
> Stop in /usr/src/release/fixit_crunch.
> #########
Cheers,
--
Ruslan Ermilov Oracle Developer/DBA,
[EMAIL PROTECTED] Sunbay Software AG,
[EMAIL PROTECTED] FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
Index: release/Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.599
diff -u -r1.599 Makefile
--- release/Makefile 2001/03/27 01:06:58 1.599
+++ release/Makefile 2001/03/29 11:35:37
@@ -410,7 +410,7 @@
( ( [ -f ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ] && \
crunchgen ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ) || \
( crunchgen ${.CURDIR}/$${j}_crunch.conf ) ) && \
- ${MAKE} -DRELEASE_CRUNCH -f $${j}_crunch.mk subclean all \
+ ${MAKE} -f $${j}_crunch.mk subclean all \
NOCRYPT=yes "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY") && \
mv $${j}_crunch/$${j}_crunch ${RD}/crunch/$${j} && \
true || { rm -rf $${j}_crunch ; false ; } ; \
Index: release/boot_crunch.conf
===================================================================
RCS file: /home/ncvs/src/release/boot_crunch.conf,v
retrieving revision 1.46
diff -u -r1.46 boot_crunch.conf
--- release/boot_crunch.conf 2001/03/10 19:52:12 1.46
+++ release/boot_crunch.conf 2001/03/29 11:47:55
@@ -1,5 +1,7 @@
# $FreeBSD: src/release/boot_crunch.conf,v 1.46 2001/03/10 19:52:12 jkh Exp $
+buildopts -DRELEASE_CRUNCH
+
srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin
srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin
srcdirs /usr/src/usr.sbin/pccard
Index: release/fixit_crunch.conf
===================================================================
RCS file: /home/ncvs/src/release/fixit_crunch.conf,v
retrieving revision 1.25
diff -u -r1.25 fixit_crunch.conf
--- release/fixit_crunch.conf 2000/06/29 13:34:53 1.25
+++ release/fixit_crunch.conf 2001/03/29 11:38:02
@@ -1,5 +1,7 @@
# $FreeBSD: src/release/fixit_crunch.conf,v 1.25 2000/06/29 13:34:53 nyan Exp $
+buildopts -DRELEASE_CRUNCH
+
# first, we list the source dirs that our programs reside in. These are
# searched in order listed to find the dir containing each program.
@@ -33,5 +35,5 @@
# finally, we specify the libraries to link in with our binary
-libs -lcrypt -ltelnet -lutil -ll -lm
+libs -lcrypt -lutil -ll -lm
libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
Index: release/i386/fixit_crunch.conf
===================================================================
RCS file: /home/ncvs/src/release/i386/fixit_crunch.conf,v
retrieving revision 1.1
diff -u -r1.1 fixit_crunch.conf
--- release/i386/fixit_crunch.conf 2000/06/29 13:34:54 1.1
+++ release/i386/fixit_crunch.conf 2001/03/29 11:48:17
@@ -1,5 +1,7 @@
# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.1 2000/06/29 13:34:54 nyan Exp $
+buildopts -DRELEASE_CRUNCH
+
# first, we list the source dirs that our programs reside in. These are
# searched in order listed to find the dir containing each program.
@@ -34,5 +36,5 @@
# finally, we specify the libraries to link in with our binary
-libs -lcrypt -ltelnet -lutil -ll -lm
+libs -lcrypt -lutil -ll -lm
libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
Index: release/pc98/fixit_crunch.conf
===================================================================
RCS file: /home/ncvs/src/release/pc98/fixit_crunch.conf,v
retrieving revision 1.1
diff -u -r1.1 fixit_crunch.conf
--- release/pc98/fixit_crunch.conf 2000/06/29 13:34:54 1.1
+++ release/pc98/fixit_crunch.conf 2001/03/29 11:48:31
@@ -1,5 +1,7 @@
# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.1 2000/06/29 13:34:54 nyan Exp $
+buildopts -DRELEASE_CRUNCH
+
# first, we list the source dirs that our programs reside in. These are
# searched in order listed to find the dir containing each program.
@@ -34,5 +36,5 @@
# finally, we specify the libraries to link in with our binary
-libs -lcrypt -ltelnet -lutil -ll -lm
+libs -lcrypt -lutil -ll -lm
libs -lcurses -ltermcap -ledit -lgnuregex -lkvm -lz
Index: usr.bin/telnet/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/telnet/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- usr.bin/telnet/Makefile 2001/03/28 12:08:22 1.17
+++ usr.bin/telnet/Makefile 2001/03/29 11:51:14
@@ -36,6 +36,9 @@
PROG= telnet
+SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
+ terminal.c tn3270.c utilities.c
+
CFLAGS+=-DKLUDGELINEMODE -DUSE_TERMIO #-DAUTHENTICATION -DENCRYPTION
CFLAGS+=-DENV_HACK
CFLAGS+=-DSKEY
@@ -55,10 +58,12 @@
CFLAGS+=-DIPSEC
DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
+.else
+.PATH: ${.CURDIR}/../../lib/libtelnet
+# XXX This was copied from lib/libtelnet/Makefile.
+SRCS+= genget.c getent.c misc.c
+CFLAGS+= -DHAS_CGETENT
.endif
-
-SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
- terminal.c tn3270.c utilities.c
# These are the sources that have encryption stuff in them.
CRYPT_SRC= authenc.c commands.c externs.h main.c network.c
