ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/trunk/Makefile.inc1
(Generate patch)

Comparing trunk/Makefile.inc1 (file contents):
Revision 7149 by laffer1, Fri Jul 24 22:40:44 2015 UTC vs.
Revision 7150 by laffer1, Sat Jul 25 20:20:22 2015 UTC

# Line 12 | Line 12
12   #       -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
13   #       -DNO_PORTSUPDATE do not update ports in ${MAKE} update
14   #       -DNO_DOCUPDATE do not update doc in ${MAKE} update
15 #       -DNO_WWWUPDATE do not update www in ${MAKE} update
15   #       -DNO_CTF do not run the DTrace CTF conversion tools on built objects
16   #       LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
17   #       TARGET="machine" to crossbuild world for a different machine type
# Line 368 | Line 367 | _worldtmp:
367          rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
368   .endif
369   .for _dir in \
370 <    lib usr legacy/usr
370 >    lib usr legacy/usr legacy/usr/bin legacy/usr/sbin
371          mkdir -p ${WORLDTMP}/${_dir}
372   .endfor
373          mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
# Line 466 | Line 465 | build32:
465              -p ${LIB32TMP}/usr/include >/dev/null
466          mkdir -p ${WORLDTMP}
467          ln -sf ${.CURDIR}/sys ${WORLDTMP}
469 .if ${MK_KERBEROS} != "no"
470 .for _t in obj depend all
471        cd ${.CURDIR}/kerberos5/tools; \
472            MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
473            DIRPRFX=kerberos5/tools/ ${_t}
474 .endfor
475 .endif
468   .for _t in obj includes
469          cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
470          cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
# Line 495 | Line 487 | build32:
487   .endfor
488   .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
489          cd ${.CURDIR}/${_dir}; \
490 +            WORLDTMP=${WORLDTMP} \
491              MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
492              DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
493              -DEARLY_BUILD build-tools
# Line 985 | Line 978 | legacy:
978          @echo "ERROR: Source upgrades from versions prior to 0.4 not supported."; \
979          false
980   .endif
981 +        mkdir -p ${MAKEOBJDIRPREFIX}/legacy/usr/bin
982   .for _tool in tools/build
983          ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
984              cd ${.CURDIR}/${_tool} && \
# Line 1022 | Line 1016 | _mklocale=     usr.bin/mklocale
1016   _sed=           usr.bin/sed
1017   .endif
1018  
1019 < .if ${BOOTSTRAPPING} < 7002
1019 > .if ${BOOTSTRAPPING} < 7003
1020   _m4=            usr.bin/m4
1021   .endif
1022  
1023 < .if ${BOOTSTRAPPING} < 7002
1023 > .if ${BOOTSTRAPPING} < 7003
1024   _lex=           usr.bin/lex
1025   .endif
1026  
1027 < .if ${BOOTSTRAPPING} < 7002
1027 > .if ${BOOTSTRAPPING} < 7003
1028   _yacc=          lib/liby \
1029                  usr.bin/yacc
1030   .endif
# Line 1112 | Line 1106 | _gcc_tools= gnu/usr.bin/cc/cc_tools
1106   .endif
1107  
1108   .if ${MK_KERBEROS} != "no"
1109 < _kerberos5_tools= kerberos5/tools
1109 > _kerberos5_bootstrap_tools= \
1110 >        kerberos5/tools/make-roken \
1111 >        kerberos5/lib/libroken \
1112 >        kerberos5/lib/libvers \
1113 >        kerberos5/tools/asn1_compile \
1114 >        kerberos5/tools/slc \
1115 >        usr.bin/compile_et
1116 >
1117 > .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
1118   .endif
1119  
1120   .if ${MK_RESCUE} != "no"
# Line 1140 | Line 1142 | build-tools:
1142   .endfor
1143   .for _tool in \
1144      ${_gcc_tools} \
1145 <    ${_kerberos5_tools}
1146 <        ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
1147 <                cd ${.CURDIR}/${_tool}; \
1148 <                ${MAKE} DIRPRFX=${_tool}/ obj; \
1149 <                ${MAKE} DIRPRFX=${_tool}/ depend; \
1150 <                ${MAKE} DIRPRFX=${_tool}/ all
1145 >    ${_kerberos5_bootstrap_tools}
1146 >        ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
1147 >                cd ${.CURDIR}/${_tool} && \
1148 >                ${MAKE} DIRPRFX=${_tool}/ obj && \
1149 >                ${MAKE} DIRPRFX=${_tool}/ depend && \
1150 >                ${MAKE} DIRPRFX=${_tool}/ all && \
1151 >                ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install
1152   .endfor
1153  
1154   #

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines