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 5123 by laffer1, Sun Aug 19 14:05:10 2012 UTC vs.
Revision 9024 by laffer1, Sat Oct 1 09:39:11 2016 UTC

# Line 1 | Line 1
1   #
2 < # $MidnightBSD: src/Makefile.inc1,v 1.42 2012/07/20 01:51:49 laffer1 Exp $
2 > # $MidnightBSD$
3   #
4   # Make command line options:
5   #       -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# 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 > #       -DDB_FROM_SRC use the user/group databases in src/etc instead of
16 > #           the system database when installing.
17   #       -DNO_CTF do not run the DTrace CTF conversion tools on built objects
18   #       LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
19 + #       LOCAL_MTREE="list of mtree files" to process to allow local directories
20 + #           to be created before files are installed
21   #       TARGET="machine" to crossbuild world for a different machine type
22   #       TARGET_ARCH= may be required when a TARGET supports multiple endians
23  
# Line 42 | Line 45 | TARGET_ARCH=${TARGET}
45  
46   .include <bsd.own.mk>
47   .include <bsd.arch.inc.mk>
48 + .include <bsd.compiler.mk>
49  
50   # We must do share/info early so that installation of info `dir'
51   # entries works correctly.  Do it first since it is less likely to
# Line 62 | Line 66 | SUBDIR+=games
66   .endif
67   .if ${MK_CDDL} != "no"
68   SUBDIR+=cddl
65 .else
66 NO_CTF=1
69   .endif
70   SUBDIR+=gnu include
71   .if ${MK_KERBEROS} != "no"
# Line 109 | Line 111 | CLEANDIR=      clean cleandepend
111   CLEANDIR=       cleandir
112   .endif
113  
114 < CVS?=           cvs
115 < CVSFLAGS?=      -r . -P -d -I!
114 < SUP?=           /usr/local/bin/cvsup
115 < SUPFLAGS?=      -g -L 2
116 < .if defined(SUPHOST)
117 < SUPFLAGS+=      -h ${SUPHOST}
118 < .endif
114 > SVN?=           /usr/local/bin/svn
115 > SVNFLAGS?=      -r HEAD
116  
117   MAKEOBJDIRPREFIX?=      /usr/obj
118   .if !defined(OSRELDATE)
# Line 133 | Line 130 | VERSION+=      ${OSRELDATE}
130   .endif
131  
132  
133 < KNOWN_ARCHES?=  amd64 i386 sparc64
133 > KNOWN_ARCHES?=  amd64 i386
134   .if ${TARGET} == ${TARGET_ARCH}
135   _t=             ${TARGET}
136   .else
# Line 174 | Line 171 | OBJTREE=       ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
171   .endif
172   WORLDTMP=       ${OBJTREE}${.CURDIR}/tmp
173   # /usr/games added for fortune which depend on strfile
174 < BPATH=          ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
174 > BPATH=          ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
175   XPATH=          ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
176   STRICTTMPPATH=  ${BPATH}:${XPATH}
177   TMPPATH=        ${STRICTTMPPATH}:${PATH}
# Line 217 | Line 214 | BOOTSTRAPPING?=        0
214  
215   # Common environment for world related stages
216   CROSSENV=       MAKEOBJDIRPREFIX=${OBJTREE} \
217 +                MACHINE_INCLUDES="${WORLDTMP}/include" \
218                  MACHINE_ARCH=${TARGET_ARCH} \
219                  MACHINE=${TARGET} \
220                  CPUTYPE=${TARGET_CPUTYPE}
# Line 231 | Line 229 | CROSSENV+=     GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
229  
230   # bootstrap-tools stage
231   BMAKEENV=       INSTALL="sh ${.CURDIR}/tools/install.sh" \
232 +                MACHINE_INCLUDES="${WORLDTMP}/include" \
233                  PATH=${BPATH}:${PATH} \
234                  WORLDTMP=${WORLDTMP} \
235                  VERSION="${VERSION}" \
236 <                MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
236 >                MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
237 >                COMPILER_TYPE=${COMPILER_TYPE}
238   BMAKE=          MAKEOBJDIRPREFIX=${WORLDTMP} \
239                  ${BMAKEENV} ${MAKE} -f Makefile.inc1 \
240                  DESTDIR= \
# Line 263 | Line 263 | XMAKE=         TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
263   WMAKEENV=       ${CROSSENV} \
264                  _SHLIBDIRPREFIX=${WORLDTMP} \
265                  _LDSCRIPTROOT= \
266 +                MACHINE_INCLUDES="${WORLDTMP}/include" \
267                  VERSION="${VERSION}" \
268                  INSTALL="sh ${.CURDIR}/tools/install.sh" \
269                  PATH=${TMPPATH}
270   .if ${MK_CDDL} == "no"
271   WMAKEENV+=      NO_CTF=1
272   .endif
273 + .if ${CC:T:Mgcc} == "gcc"
274 + WMAKE_COMPILER_TYPE=    gcc
275 + .elif ${CC:T:Mclang} == "clang"
276 + WMAKE_COMPILER_TYPE=    clang
277 + .elif ${MK_CLANG_IS_CC} == "no"
278 + WMAKE_COMPILER_TYPE=    gcc
279 + .else
280 + WMAKE_COMPILER_TYPE=    clang
281 + .endif
282 + WMAKEENV+=      COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
283   WMAKE=          ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
284  
285   .if ${TARGET_ARCH} == "amd64"
# Line 282 | Line 293 | LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2
293   LIB32CPUFLAGS=  -march=${TARGET_CPUTYPE}
294   .endif
295   LIB32WMAKEENV=  MACHINE=i386 MACHINE_ARCH=i386 \
296 <                MACHINE_CPU="i686 mmx sse sse2" \
297 <                LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
298 <                AS="${AS} --32"
296 >                MACHINE_CPU="i686 mmx sse sse2"
297 > LIB32WMAKEFLAGS=        \
298 >                AS="${AS} --32" \
299 >                LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
300   .endif
301  
302  
# Line 300 | Line 312 | LIB32WMAKEENV+=        MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
312                  VERSION="${VERSION}" \
313                  INSTALL="sh ${.CURDIR}/tools/install.sh" \
314                  PATH=${TMPPATH} \
315 +                LIBDIR=/usr/lib32 \
316 +                SHLIBDIR=/usr/lib32 \
317 +                LIBPRIVATEDIR=/usr/lib32/private \
318 +                MACHINE_INCLUDES="${WORLDTMP}/include" \
319 +                COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
320 + LIB32WMAKEFLAGS+=       \
321                  CC="${CC} ${LIB32FLAGS}" \
322                  CXX="${CXX} ${LIB32FLAGS}" \
323 <                LIBDIR=/usr/lib32 \
324 <                SHLIBDIR=/usr/lib32
323 >                DESTDIR=${LIB32TMP} \
324 >                -DCOMPAT_32BIT \
325 >                -DLIBRARIES_ONLY \
326 >                -DNO_CPU_CFLAGS \
327 >                -DNO_CTF \
328 >                -DNO_LINT
329  
330 < LIB32WMAKE=     ${LIB32WMAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
331 <                -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
332 <                -DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
333 <                DESTDIR=${LIB32TMP}
312 < LIB32IMAKE=     ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS
330 > LIB32WMAKE=     ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
331 >                -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
332 > LIB32IMAKE=     ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
333 >                ${IMAKE_INSTALL}
334   .endif
335  
315 # install stage
336   IMAKEENV=       ${CROSSENV:N_LDSCRIPTROOT=*}
337 < IMAKE=          ${IMAKEENV} ${MAKE} -f Makefile.inc1
337 > IMAKE=          ${IMAKEENV} ${MAKE} -f Makefile.inc1 \
338 >                ${IMAKE_INSTALL} ${IMAKE_MTREE}
339   .if empty(.MAKEFLAGS:M-n)
340   IMAKEENV+=      PATH=${STRICTTMPPATH}:${INSTALLTMP} \
341                  LD_LIBRARY_PATH=${INSTALLTMP} \
# Line 323 | Line 344 | IMAKE+=                __MAKE_SHELL=${INSTALLTMP}/sh
344   .else
345   IMAKEENV+=      PATH=${TMPPATH}:${INSTALLTMP}
346   .endif
347 + .if defined(DB_FROM_SRC)
348 + IMAKE_INSTALL=  INSTALL="install -N ${.CURDIR}/etc"
349 + IMAKE_MTREE=    MTREE_CMD="nmtree -N ${.CURDIR}/etc"
350 + .endif
351  
352   # kernel stage
353   KMAKEENV=       ${WMAKEENV}
# Line 360 | Line 385 | _worldtmp:
385          rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
386   .endif
387   .for _dir in \
388 <    lib usr legacy/usr
388 >    lib usr legacy/usr legacy/usr/bin legacy/usr/sbin
389          mkdir -p ${WORLDTMP}/${_dir}
390   .endfor
391          mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
# Line 378 | Line 403 | _worldtmp:
403          mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
404              -p ${WORLDTMP}/usr/include >/dev/null
405   .endif
406 + .for _mtree in ${LOCAL_MTREE}
407 +        mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
408 + .endfor
409   _legacy:
410          @echo
411          @echo "--------------------------------------------------------------"
# Line 458 | Line 486 | build32:
486              -p ${LIB32TMP}/usr/include >/dev/null
487          mkdir -p ${WORLDTMP}
488          ln -sf ${.CURDIR}/sys ${WORLDTMP}
461 .if ${MK_KERBEROS} != "no"
462 .for _t in obj depend all
463        cd ${.CURDIR}/kerberos5/tools; \
464            MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
465            DIRPRFX=kerberos5/tools/ ${_t}
466 .endfor
467 .endif
489   .for _t in obj includes
490          cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
491          cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
# Line 487 | Line 508 | build32:
508   .endfor
509   .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
510          cd ${.CURDIR}/${_dir}; \
511 +            WORLDTMP=${WORLDTMP} \
512              MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
513              DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
514              -DEARLY_BUILD build-tools
# Line 569 | Line 591 | kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_librar
591   installcheck:
592  
593   #
594 < # Require DESTDIR to be set if installing for a different architecture.
594 > # Require DESTDIR to be set if installing for a different architecture or
595 > # using the user/group database in the source tree.
596   #
597 < .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
597 > .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
598 >    defined(DB_FROM_SRC)
599   .if !make(distributeworld)
600   installcheck: installcheck_DESTDIR
601   installcheck_DESTDIR:
# Line 582 | Line 606 | installcheck_DESTDIR:
606   .endif
607   .endif
608  
609 + .if !defined(DB_FROM_SRC)
610   #
611   # Check for missing UIDs/GIDs.
612   #
613 < CHECK_UIDS=
613 > CHECK_UIDS=     auditdistd
614   CHECK_GIDS=     audit
615   .if ${MK_SENDMAIL} != "no"
616   CHECK_UIDS+=    smmsp
# Line 609 | Line 634 | installcheck_UGID:
634                  false; \
635          fi
636   .endfor
637 + .endif
638  
639   #
640   # Required install tools to be saved in a scratch dir for safety.
# Line 620 | Line 646 | _install-info= install-info
646   _zoneinfo=      zic tzsetup
647   .endif
648  
649 + .if exists(/usr/sbin/nmtree)
650 + _nmtree_itools= nmtree
651 + .endif
652 +
653   ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
654          date echo egrep find grep ${_install-info} \
655 <        ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
656 <        test true uname wc ${_zoneinfo}
655 >        ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
656 >        rm sed sh sysctl test true uname wc ${_zoneinfo}
657  
658   #
659   # distributeworld
# Line 636 | Line 666 | ITOOLS=        [ awk cap_mkdb cat chflags chmod chown \
666   #
667  
668   # Non-base distributions produced by the base system
669 < EXTRA_DISTRIBUTIONS=    doc games
669 > EXTRA_DISTRIBUTIONS=    doc
670 > .if ${MK_GAMES} != "no"
671 > EXTRA_DISTRIBUTIONS+=   games
672 > .endif
673   .if defined(LIB32TMP) && ${MK_LIB32} != "no"
674   EXTRA_DISTRIBUTIONS+=   lib32
675   .endif
# Line 675 | Line 708 | distributeworld installworld: installcheck
708   .endfor
709          -mkdir ${DESTDIR}/${DISTDIR}/base
710          ${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \
711 <            DESTDIR=${DESTDIR}/${DISTDIR}/base
711 >            LOCAL_MTREE=${LOCAL_MTREE} DESTDIR=${DESTDIR}/${DISTDIR}/base
712   .endif
713          ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
714              ${IMAKEENV} rm -rf ${INSTALLTMP}
# Line 702 | Line 735 | reinstall:
735          @echo "--------------------------------------------------------------"
736          @echo ">>> Making hierarchy"
737          @echo "--------------------------------------------------------------"
738 <        ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy
738 >        ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
739 >            LOCAL_MTREE=${LOCAL_MTREE} hierarchy
740          @echo
741          @echo "--------------------------------------------------------------"
742          @echo ">>> Installing everything"
# Line 723 | Line 757 | redistribute:
757   .endif
758  
759   distrib-dirs distribution:
760 <        cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} ${.TARGET}
760 >        cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
761 >            ${IMAKE_INSTALL} ${IMAKE_MTREE} ${.TARGET}
762  
763   #
764   # buildkernel and installkernel
# Line 871 | Line 906 | reinstallkernel reinstallkernel.debug: installcheck
906          @echo "--------------------------------------------------------------"
907          cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
908              ${CROSSENV} PATH=${TMPPATH} \
909 <            ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
909 >            ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
910  
911   distributekernel distributekernel.debug:
912   .if empty(INSTALLKERNEL)
# Line 973 | Line 1008 | update:
1008   # legacy: Build compatibility shims for the next three targets
1009   #
1010   legacy:
1011 < .if ${BOOTSTRAPPING} < 1000 && ${BOOTSTRAPPING} != 0
1012 <        @echo "ERROR: Source upgrades from versions prior to 0.1 not supported."; \
1011 > .if ${BOOTSTRAPPING} < 7000 && ${BOOTSTRAPPING} != 0
1012 >        @echo "ERROR: Source upgrades from versions prior to 0.7 not supported."; \
1013          false
1014   .endif
1015 +        mkdir -p ${MAKEOBJDIRPREFIX}/legacy/usr/bin
1016   .for _tool in tools/build
1017          ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
1018 <            cd ${.CURDIR}/${_tool}; \
1019 <            ${MAKE} DIRPRFX=${_tool}/ obj; \
1020 <            ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
1021 <            ${MAKE} DIRPRFX=${_tool}/ depend; \
1022 <            ${MAKE} DIRPRFX=${_tool}/ all; \
1018 >            cd ${.CURDIR}/${_tool} && \
1019 >            ${MAKE} DIRPRFX=${_tool}/ obj && \
1020 >            ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
1021 >            ${MAKE} DIRPRFX=${_tool}/ depend && \
1022 >            ${MAKE} DIRPRFX=${_tool}/ all && \
1023              ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
1024   .endfor
1025  
# Line 1002 | Line 1038 | _gperf=                gnu/usr.bin/gperf
1038   _groff=         gnu/usr.bin/groff
1039   .endif
1040  
1041 < .if ${BOOTSTRAPPING} >= 4000 && ${BOOTSTRAPPING} < 4016
1041 > .if ${BOOTSTRAPPING} >= 4000 && ${BOOTSTRAPPING} < 4015
1042   _ar=            usr.bin/ar
1043   .endif
1044  
1045 < .if ${BOOTSTRAPPING} < 4016
1045 > .if ${BOOTSTRAPPING} < 4015
1046   _mklocale=      usr.bin/mklocale
1047   .endif
1048  
1049 < .if ${BOOTSTRAPPING} < 4016
1049 > .if ${BOOTSTRAPPING} < 4015
1050   _sed=           usr.bin/sed
1051   .endif
1052  
1053 < .if ${BOOTSTRAPPING} < 4016
1053 > .if ${BOOTSTRAPPING} < 7003
1054 > _m4=            usr.bin/m4
1055 > .endif
1056 >
1057 > .if ${BOOTSTRAPPING} < 7003
1058   _lex=           usr.bin/lex
1059   .endif
1060  
1061 < .if ${BOOTSTRAPPING} < 4016
1062 < _yacc=          usr.bin/yacc
1061 > .if ${BOOTSTRAPPING} < 7003
1062 > _yacc=          lib/liby \
1063 >                usr.bin/yacc
1064   .endif
1065  
1066 < .if ${BOOTSTRAPPING} >= 4016
1067 < _awk=           usr.bin/awk
1066 > .if ${BOOTSTRAPPING} < 9002
1067 > _nmtree=       lib/libnetbsd \
1068 >               usr.sbin/nmtree
1069   .endif
1070  
1071 +
1072   .if ${MK_BSNMP} != "no" && \
1073      (${BOOTSTRAPPING} < 4015 || !exists(/usr/sbin/gensnmptree))
1074   _gensnmptree=   usr.sbin/bsnmpd/gensnmptree
# Line 1045 | Line 1088 | _clang_tblgen= \
1088   .endif
1089  
1090   .if ${MK_CDDL} != "no" && \
1091 <    ${BOOTSTRAPPING} < 4016 && \
1092 <    !(${BOOTSTRAPPING} >= 4000 && ${BOOTSTRAPPING} < 4016)
1091 >    ${BOOTSTRAPPING} < 4015 && \
1092 >    !(${BOOTSTRAPPING} >= 4000 && ${BOOTSTRAPPING} < 4015)
1093   _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
1094      lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
1095   .endif
# Line 1061 | Line 1104 | _dtc= gnu/usr.bin/dtc
1104   bootstrap-tools:
1105   .for _tool in \
1106      ${_clang_tblgen} \
1107 +    ${_kerberos5_bootstrap_tools} \
1108      ${_dtrace_tools} \
1109      ${_strfile} \
1110      ${_gperf} \
# Line 1074 | Line 1118 | bootstrap-tools:
1118      usr.bin/rpcgen \
1119      ${_sed} \
1120      ${_yacc} \
1121 +    ${_m4} \
1122      ${_lex} \
1123 +    lib/libmd \
1124      usr.bin/xinstall \
1125      ${_gensnmptree} \
1126      usr.sbin/config \
1127 <    ${_crunchgen}
1127 >    ${_crunchgen} \
1128 >    ${_nmtree}
1129          ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
1130                  cd ${.CURDIR}/${_tool}; \
1131                  ${MAKE} DIRPRFX=${_tool}/ obj; \
# Line 1098 | Line 1145 | _aicasm= sys/modules/aic7xxx/aicasm
1145   _share= share/syscons/scrnmaps
1146   .endif
1147  
1148 < .if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
1148 > .if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
1149   _gcc_tools= gnu/usr.bin/cc/cc_tools
1150   .endif
1151  
1152   .if ${MK_KERBEROS} != "no"
1153 < _kerberos5_tools= kerberos5/tools
1153 > _kerberos5_bootstrap_tools= \
1154 >        kerberos5/tools/make-roken \
1155 >        kerberos5/lib/libroken \
1156 >        kerberos5/lib/libvers \
1157 >        kerberos5/tools/asn1_compile \
1158 >        kerberos5/tools/slc \
1159 >        usr.bin/compile_et
1160 >
1161 > .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
1162   .endif
1163  
1164   .if ${MK_RESCUE} != "no"
# Line 1131 | Line 1186 | build-tools:
1186   .endfor
1187   .for _tool in \
1188      ${_gcc_tools} \
1189 <    ${_kerberos5_tools}
1190 <        ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
1191 <                cd ${.CURDIR}/${_tool}; \
1192 <                ${MAKE} DIRPRFX=${_tool}/ obj; \
1193 <                ${MAKE} DIRPRFX=${_tool}/ depend; \
1194 <                ${MAKE} DIRPRFX=${_tool}/ all
1189 >    ${_kerberos5_bootstrap_tools}
1190 >        ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
1191 >                cd ${.CURDIR}/${_tool} && \
1192 >                ${MAKE} DIRPRFX=${_tool}/ obj && \
1193 >                ${MAKE} DIRPRFX=${_tool}/ depend && \
1194 >                ${MAKE} DIRPRFX=${_tool}/ all && \
1195 >                ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install
1196   .endfor
1197  
1198   #
1199   # cross-tools: Build cross-building tools
1200   #
1201 < .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 4012
1201 > .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 4016
1202   .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
1203   _btxld=         usr.sbin/btxld
1204   .endif
# Line 1165 | Line 1221 | _clang=                usr.bin/clang
1221   _clang_libs=    lib/clang
1222   .endif
1223  
1224 < .if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
1224 > .if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
1225   _cc=            gnu/usr.bin/cc
1226   .endif
1227  
# Line 1191 | Line 1247 | cross-tools:
1247   # hierarchy - ensure that all the needed directories are present
1248   #
1249   hierarchy:
1250 <        cd ${.CURDIR}/etc;              ${MAKE} distrib-dirs
1250 >        cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
1251  
1252   #
1253   # libraries - build all libraries, and install them under ${DESTDIR}.
# Line 1237 | Line 1293 | gnu/lib/libgcc__L: lib/libc__L
1293   lib/libcxxrt__L: gnu/lib/libgcc__L
1294   .endif
1295  
1296 < _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
1296 > _prebuild_libs= ${_kerberos5_lib_libasn1} \
1297 >                ${_kerberos5_lib_libhdb} \
1298 >                ${_kerberos5_lib_libheimbase} \
1299                  ${_kerberos5_lib_libheimntlm} \
1300 +                ${_kerberos5_lib_libheimsqlite} \
1301 +                ${_kerberos5_lib_libheimipcc} \
1302                  ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
1303                  ${_kerberos5_lib_libroken} \
1304 +                ${_kerberos5_lib_libwind} \
1305                  lib/libbz2 lib/libcom_err lib/libcrypt \
1306 <                lib/libexpat \
1306 >                lib/libelf lib/libexpat \
1307                  ${_lib_libgssapi} ${_lib_libipx} \
1308                  lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
1309                  lib/ncurses/ncurses lib/ncurses/ncursesw \
1310                  lib/libopie lib/libpam ${_lib_libthr} \
1311                  lib/libradius lib/libsbuf lib/libtacplus \
1312 <                ${_cddl_lib_libumem} \
1312 >                ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
1313                  lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
1314                  ${_secure_lib_libcrypto} ${_secure_lib_libssh} \
1315                  ${_secure_lib_libssl} lib/libsqlite3 \
1316 <        lib/libarchive lib/libfetch lib/libmagic
1316 >                lib/libarchive lib/libfetch lib/libmagic \
1317 >                lib/libblocksruntime
1318   .if ${MK_LIBTHR} != "no"
1319   _lib_libthr=    lib/libthr
1320   .endif
# Line 1271 | Line 1333 | _apache_lib= apache/lib
1333  
1334   .if ${MK_CDDL} != "no"
1335   _cddl_lib_libumem= cddl/lib/libumem
1336 + _cddl_lib_libnvpair= cddl/lib/libnvpair
1337   _cddl_lib= cddl/lib
1338   .endif
1339  
# Line 1295 | Line 1358 | _secure_lib=   secure/lib
1358   .if ${MK_KERBEROS} != "no"
1359   kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
1360   kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1361 <    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L
1362 < kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L
1361 >    kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
1362 >    kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L
1363 > kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
1364 >    kerberos5/lib/libroken__L lib/libcom_err__L
1365   kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1366 <    secure/lib/libcrypto__L kerberos5/lib/libroken__L
1366 >    secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwind__L
1367   kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1368      lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
1369 <    kerberos5/lib/libroken__L
1369 >    kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
1370 >    kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
1371   kerberos5/lib/libroken__L: lib/libcrypt__L
1372 + kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
1373 + kerberos5/lib/libheimbase__L: lib/libthr__L
1374 + kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
1375 + kerberos5/lib/libheimsqlite__L: lib/libthr__L
1376   .endif
1377  
1378   .if ${MK_GSSAPI} != "no"
# Line 1314 | Line 1384 | _lib_libipx=   lib/libipx
1384   .endif
1385  
1386   .if ${MK_KERBEROS} != "no"
1387 < _kerberos5_lib= kerberos5/lib
1387 > _kerberos5_lib= kerberos5/lib
1388   _kerberos5_lib_libasn1= kerberos5/lib/libasn1
1389   _kerberos5_lib_libhdb= kerberos5/lib/libhdb
1390 + _kerberos5_lib_libheimbase= kerberos5/lib/libheimbase
1391   _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
1392   _kerberos5_lib_libhx509= kerberos5/lib/libhx509
1393   _kerberos5_lib_libroken= kerberos5/lib/libroken
1394   _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
1395 + _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
1396 + _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
1397 + _kerberos5_lib_libwind= kerberos5/lib/libwind
1398 + _libcom_err= lib/libcom_err
1399   .endif
1400  
1401   .if ${MK_NIS} != "no"
# Line 1332 | Line 1407 | lib/libradius__L: lib/libmd__L
1407   .endif
1408  
1409   .for _lib in ${_prereq_libs}
1410 < ${_lib}__PL: .PHONY
1410 > ${_lib}__PL: .PHONY .MAKE
1411   .if exists(${.CURDIR}/${_lib})
1412          ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
1413 <                cd ${.CURDIR}/${_lib}; \
1414 <                ${MAKE} DIRPRFX=${_lib}/ obj; \
1415 <                ${MAKE} DIRPRFX=${_lib}/ depend; \
1416 <                ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
1413 >                cd ${.CURDIR}/${_lib} && \
1414 >                ${MAKE} DIRPRFX=${_lib}/ obj && \
1415 >                ${MAKE} DIRPRFX=${_lib}/ depend && \
1416 >                ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
1417                  ${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
1418   .endif
1419   .endfor
# Line 1347 | Line 1422 | ${_lib}__PL: .PHONY
1422   ${_lib}__L: .PHONY
1423   .if exists(${.CURDIR}/${_lib})
1424          ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
1425 <                cd ${.CURDIR}/${_lib}; \
1426 <                ${MAKE} DIRPRFX=${_lib}/ obj; \
1427 <                ${MAKE} DIRPRFX=${_lib}/ depend; \
1428 <                ${MAKE} DIRPRFX=${_lib}/ all; \
1425 >                cd ${.CURDIR}/${_lib} && \
1426 >                ${MAKE} DIRPRFX=${_lib}/ obj && \
1427 >                ${MAKE} DIRPRFX=${_lib}/ depend && \
1428 >                ${MAKE} DIRPRFX=${_lib}/ all && \
1429                  ${MAKE} DIRPRFX=${_lib}/ install
1430   .endif
1431   .endfor
# Line 1529 | Line 1604 | DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
1604   .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
1605   .if exists(${KERNCONFDIR}/${KERNCONF})
1606   FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
1607 <        ${KERNCONFDIR}/${KERNCONF}
1607 >        ${KERNCONFDIR}/${KERNCONF} ; echo
1608   .endif
1609   .endif
1610  
# Line 1579 | Line 1654 | NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LI
1654  
1655   XDDIR=${XDEV_ARCH}-midnightbsd
1656   XDTP=/usr/${XDDIR}
1657 < CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
1657 > CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
1658 >        INSTALL="sh ${.CURDIR}/tools/install.sh"
1659   CDENV= ${CDBENV} \
1660          _SHLIBDIRPREFIX=${XDTP} \
1661          TOOLS_PREFIX=${XDTP}

Comparing trunk/Makefile.inc1 (property cvs2svn:cvs-rev):
Revision 5123 by laffer1, Sun Aug 19 14:05:10 2012 UTC vs.
Revision 9024 by laffer1, Sat Oct 1 09:39:11 2016 UTC

# Line 1 | Line 0
1 1.43

Comparing trunk/Makefile.inc1 (property svn:keywords):
Revision 5123 by laffer1, Sun Aug 19 14:05:10 2012 UTC vs.
Revision 9024 by laffer1, Sat Oct 1 09:39:11 2016 UTC

# Line 0 | Line 1
1 + MidnightBSD=%H

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines