X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/5a2c7d772ee38cca87946acc5e79c088be58902e..e18a7d0f2bbad21aa7b0befda9e622876598ee6e:/Makefile.inc1 diff --git a/Makefile.inc1 b/Makefile.inc1 index 7c302ead05..b7dd4f9c33 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,5 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.118 2008/06/24 20:22:30 thomas Exp $ # # Build-time options are documented in make.conf(5). # @@ -120,8 +119,8 @@ DESTDIRBASE?= ${OBJTREE}${.CURDIR} .MAKEFLAGS:= ${.MAKEFLAGS:NDESTDIR=*} # This sets the compiler we use to build the world/kernel with -WORLD_CCVER?= gcc41 -WORLD_BINUTILSVER?= binutils217 +WORLD_CCVER?= gcc44 +WORLD_BINUTILSVER?= binutils222 # temporary until everybody has converted to x86_64 .if ${MACHINE_ARCH} == "amd64" @@ -206,7 +205,7 @@ BTOOLSPATH= ${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTO # The strict temporary command path contains all binaries required # by the buildworld system after the cross-tools stage. # -STRICTTMPPATH= ${CTOOLSDEST}/usr/sbin:${CTOOLSDEST}/usr/bin:${CTOOLSDEST}/bin:${CTOOLSDEST}/usr/games:${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTOOLSDEST}/usr/games +STRICTTMPPATH= ${CTOOLSDEST}/usr/sbin:${CTOOLSDEST}/usr/bin:${CTOOLSDEST}/bin:${CTOOLSDEST}/usr/games:${BTOOLSDEST}/usr/sbin:${BTOOLSDEST}/usr/bin:${BTOOLSDEST}/bin:${BTOOLSDEST}/usr/games:/usr/pkg/bin TMPDIR?= /tmp TMPPID!= echo $$$$ @@ -469,13 +468,6 @@ reinstall: @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) - @echo - @echo "--------------------------------------------------------------" - @echo ">>> Rebuilding man page indices" - @echo "--------------------------------------------------------------" - cd ${.CURDIR}/share/man; ${MAKE} makedb -.endif # # buildkernel, nativekernel, quickkernel, and installkernel @@ -762,27 +754,38 @@ installmost: _strfile= games/fortune/strfile .endif -bootstrap-tools: +BSTRAPDIRS= ${_strfile} \ + usr.bin/patch \ + bin/chmod bin/cp bin/cpdup bin/dd bin/mkdir bin/rm bin/echo \ + bin/test bin/cat bin/ln bin/mv bin/csh bin/expr bin/sh \ + bin/hostname bin/kill \ + usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \ + usr.bin/m4 usr.bin/rpcgen usr.bin/make usr.bin/awk usr.bin/stat \ + usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \ + usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \ + usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \ + usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \ + usr.bin/mklocale usr.bin/uuencode usr.bin/compile_et usr.bin/hexdump \ + usr.bin/cap_mkdb usr.bin/true usr.bin/false \ + usr.bin/cmp usr.bin/xargs usr.bin/id usr.bin/env usr.bin/dirname \ + usr.bin/tail usr.bin/unifdef \ + usr.sbin/chown usr.sbin/mtree usr.sbin/config \ + usr.sbin/btxld usr.sbin/zic usr.sbin/makewhatis \ + gnu/usr.bin/texinfo gnu/usr.bin/grep usr.bin/sort \ + usr.bin/gzip usr.bin/bzip2 usr.bin/mkcsmapper usr.bin/mkesdb + +bootstrap-tools: bootstrap-tools-before bootstrap-tools-targets + touch ${BTOOLSDEST}/.bootstrap_done + +bootstrap-tools-before: ${LN} -fs /bin/date ${BTOOLSDEST}/bin/date -.for _tool in ${_strfile} \ - usr.bin/patch \ - bin/chmod bin/cp bin/cpdup bin/dd bin/mkdir bin/rm bin/echo bin/test \ - bin/cat bin/ln bin/mv bin/csh bin/expr bin/sh \ - bin/hostname bin/kill \ - usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \ - usr.bin/m4 usr.bin/rpcgen usr.bin/make usr.bin/awk usr.bin/stat \ - usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \ - usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \ - usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \ - usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \ - usr.bin/mklocale usr.bin/uuencode usr.bin/compile_et usr.bin/hexdump \ - usr.bin/cap_mkdb usr.bin/true usr.bin/false \ - usr.bin/cmp usr.bin/xargs usr.bin/id usr.bin/env usr.bin/dirname \ - usr.bin/tail usr.bin/unifdef \ - usr.sbin/chown usr.sbin/mtree usr.sbin/config \ - usr.sbin/btxld usr.sbin/zic usr.sbin/makewhatis \ - gnu/usr.bin/texinfo gnu/usr.bin/grep gnu/usr.bin/sort \ - usr.bin/gzip usr.bin/bzip2 usr.bin/mkcsmapper usr.bin/mkesdb + +bootstrap-tools-targets: ${BSTRAPDIRS:S/^/bstrap-/} + +.ORDER: bootstrap-tools-before bootstrap-tools-targets + +.for _tool in ${BSTRAPDIRS} +bstrap-${_tool}! ${ECHODIR} "===> ${_tool} (bootstrap-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -790,7 +793,6 @@ bootstrap-tools: ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${BTOOLSDEST} install .endfor - touch ${BTOOLSDEST}/.bootstrap_done # build-tools: Build special purpose build tools. # @@ -801,17 +803,27 @@ bootstrap-tools: _share= share/syscons/scrnmaps .endif +.if !defined(NO_GCC41) _gcc41_cross= gnu/usr.bin/cc41 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools -.if !defined(NO_GCC44) +.endif _gcc44_cross= gnu/usr.bin/cc44 _gcc44_tools= gnu/usr.bin/cc44/cc_prep gnu/usr.bin/cc44/cc_tools -.endif _custom_cross= libexec/customcc _binutils= gnu/usr.bin/${WORLD_BINUTILSVER} -build-tools: -.for _tool in ${_gcc41_tools} ${_gcc44_tools} ${_libkrb5} ${_share} +BTOOLSDIRS= ${_gcc41_tools} ${_gcc44_tools} ${_libkrb5} ${_share} + +build-tools: build-tools-targets + touch ${BTOOLSDEST}/.build_done + +build-tools-targets: ${BTOOLSDIRS:S/^/btools-/} + +.ORDER: ${_gcc41_tools:S/^/btools-/} +.ORDER: ${_gcc44_tools:S/^/btools-/} + +.for _tool in ${BTOOLSDIRS} +btools-${_tool}! ${ECHODIR} "===> ${_tool} (build-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -819,7 +831,6 @@ build-tools: ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${BTOOLSDEST} install .endfor - touch ${BTOOLSDEST}/.build_done # # cross-tools: Build cross-building tools @@ -828,10 +839,16 @@ build-tools: _btxld= usr.sbin/btxld .endif -cross-tools: -.for _tool in ${_btxld} ${_binutils} \ - usr.bin/objformat \ - ${_gcc41_cross} ${_gcc44_cross} ${_custom_cross} +CTOOLSDIRS= ${_btxld} ${_binutils} usr.bin/objformat \ + ${_gcc41_cross} ${_gcc44_cross} ${_custom_cross} + +cross-tools: cross-tools-targets + touch ${CTOOLSDEST}/.cross_done + +cross-tools-targets: ${CTOOLSDIRS:S/^/ctools-/} + +.for _tool in ${CTOOLSDIRS} +ctools-${_tool}! ${ECHODIR} "===> ${_tool} (cross-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -839,7 +856,6 @@ cross-tools: ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${CTOOLSDEST} install .endfor - touch ${CTOOLSDEST}/.cross_done # # hierarchy - ensure that all the needed directories are present @@ -858,14 +874,14 @@ hierarchy: # to specify the correct CCVER or 'cc' will not exec the correct compiler. # libraries: +.if !defined(NO_GCC41) cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc41 \ ${MAKE} -f Makefile.inc1 _startup_libs41; -.if !defined(NO_GCC44) +.endif cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc44 \ ${MAKE} -f Makefile.inc1 _startup_libs44; -.endif cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ @@ -882,7 +898,7 @@ _startup_libs41= gnu/lib/gcc41/csu gnu/lib/gcc41/libgcc _startup_libs44= gnu/lib/gcc44/csu gnu/lib/gcc44/libgcc _startup_libs= lib/csu lib/libc lib/libc_rtld -_prebuild_libs= lib/libbz2 lib/libz +_prebuild_libs= lib/libbz2 lib/liblzma lib/libz _prebuild_libs+= lib/libutil _generic_libs= gnu/lib @@ -890,7 +906,8 @@ _generic_libs= gnu/lib _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libmd \ lib/libncurses/libncurses lib/libopie lib/libradius \ lib/libsbuf lib/libtacplus lib/libm \ - lib/libpam lib/libypclnt lib/lib${THREAD_LIB} + lib/libpam lib/libypclnt lib/lib${THREAD_LIB} \ + lib/libpthread lib/libprop lib/libdevattr lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L