buildworld subsystem update addendum. Hopefully fix buildkernel,
authorMatthew Dillon <dillon@dragonflybsd.org>
Mon, 22 Mar 2004 23:49:06 +0000 (23:49 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Mon, 22 Mar 2004 23:49:06 +0000 (23:49 +0000)
and fix the GROFF/TROFF environment paths (should solve an infinite loop
occuring in troff when building from FreeBSD-4.x).

Makefile.inc1
secure/lib/libcrypto/Makefile

index 8e727a7..329defc 100644 (file)
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.23 2004/03/22 20:57:17 dillon Exp $
+# $DragonFly: src/Makefile.inc1,v 1.24 2004/03/22 23:49:05 dillon Exp $
 #
 # Make command line options:
 #      -DMAKE_KERBEROS5 to build Kerberos5
@@ -251,9 +251,9 @@ CROSSENV=   MAKEOBJDIRPREFIX=${WORLDDEST} \
                MACHINE=${TARGET} \
                OBJFORMAT_PATH=${CTOOLSDEST} \
                PERL5LIB=${WORLDDEST}/usr/libdata/perl/5.00503 \
-               GROFF_BIN_PATH=${WORLDDEST}/usr/bin \
-               GROFF_FONT_PATH=${WORLDDEST}/usr/share/groff_font \
-               GROFF_TMAC_PATH=${WORLDDEST}/usr/share/tmac
+               GROFF_BIN_PATH=${BTOOLSDEST}/usr/bin \
+               GROFF_FONT_PATH=${BTOOLSDEST}/usr/share/groff_font \
+               GROFF_TMAC_PATH=${BTOOLSDEST}/usr/share/tmac
 
 WMAKEENV=      ${CROSSENV} \
                DESTDIR=${WORLDDEST} \
@@ -269,7 +269,7 @@ IMAKE=              ${IMAKEENV} ${MAKE} -f Makefile.inc1
 
 # kernel stage
 KMAKEENV=      ${WMAKEENV} \
-               OBJFORMAT_PATH=${CTOOLSDEST}:${OBJFORMAT_PATH}
+               OBJFORMAT_PATH=${WORLDDEST}:${OBJFORMAT_PATH}
 
 # buildworld
 #
@@ -638,7 +638,7 @@ bootstrap-tools:
     usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \
     usr.bin/mklocale usr.bin/uuencode usr.bin/compile_et \
     usr.bin/vi usr.bin/cap_mkdb usr.bin/vgrind usr.bin/true usr.bin/false \
-    usr.bin/cmp usr.bin/xargs usr.bin/id \
+    usr.bin/cmp usr.bin/xargs usr.bin/id usr.bin/env usr.bin/dirname \
     usr.sbin/chown usr.sbin/mtree usr.sbin/config \
     usr.sbin/btxld usr.sbin/pwd_mkdb usr.sbin/zic \
     gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo \
index c326ab3..0dc84bb 100644 (file)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.15.2.14 2003/02/14 22:38:14 nectar Exp $
-# $DragonFly: src/secure/lib/libcrypto/Makefile,v 1.2 2003/06/17 04:27:48 dillon Exp $
+# $DragonFly: src/secure/lib/libcrypto/Makefile,v 1.3 2004/03/22 23:49:06 dillon Exp $
 
 LIB=           crypto
 SHLIB_MAJOR=   3
@@ -204,6 +204,8 @@ SRCS+=      v3_akey.c v3_akeya.c v3_alt.c v3_bcons.c v3_bitst.c \
 INCS=          ${HDRS} openssl/evp.h openssl/opensslconf.h
 INCSDIR=       ${INCLUDEDIR}/openssl
 
+v3err.o: openssl/opensslconf.h openssl/evp.h
+
 .include <bsd.lib.mk>
 
 .if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES