Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.297 retrieving revision 1.312 diff -u -p -r1.297 -r1.312 --- src/Makefile 2012/08/14 13:12:15 1.297 +++ src/Makefile 2015/01/07 20:42:01 1.312 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.297 2012/08/14 13:12:15 apb Exp $ +# $NetBSD: Makefile,v 1.312 2015/01/07 20:42:01 joerg Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -64,11 +64,11 @@ # Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs # from ${DESTDIR} # iso-image: -# Create CD-ROM image in RELEASEDIR/iso. +# Create CD-ROM image in RELEASEDIR/images. # RELEASEDIR must already have been populated by `make release' # or equivalent. # iso-image-source: -# Create CD-ROM image with source in RELEASEDIR/iso. +# Create CD-ROM image with source in RELEASEDIR/images. # RELEASEDIR must already have been populated by # `make release sourcesets' or equivalent. # live-image: @@ -87,32 +87,14 @@ # do-top-obj: creates the top level object directory. # do-tools-obj: creates object directories for the host toolchain. # do-tools: builds host toolchain. +# params: record the values of variables that might affect the +# build. # obj: creates object directories. # do-distrib-dirs: creates the distribution directories. # includes: installs include files. -# do-tools-compat: builds the "libnbcompat" library; needed for some -# random host tool programs in the source tree. -# do-lib-csu: builds and installs prerequisites from lib/csu. -# do-libgcc: builds and installs prerequisites from -# gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and -# gnu/lib/libgcc${LIBGCC_EXT}. -# do-libpcc: builds and install prerequisites from -# external/bsd/pcc/crtstuff (if necessary) and -# external/bsd/pcc/libpcc. -# do-lib-libc: builds and installs prerequisites from lib/libc. -# do-lib: builds and installs prerequisites from lib. -# do-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/lib -# do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib -# do-sys-rump-kern-lib: builds and installs prereq. from sys/rump/kern/lib -# do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib -# do-sys-modules: builds and installs kernel modules (used by rump binaries) -# do-ld.so: builds and installs prerequisites from libexec/ld.*_so. -# do-compat-lib-csu: builds and installs prerequisites from compat/lib/csu +# do-lib: builds and installs prerequisites from lib # if ${MKCOMPAT} != "no". -# do-compat-libgcc: builds and installs prerequisites from -# compat/gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and -# compat/gnu/lib/libgcc${LIBGCC_EXT} if ${MKCOMPAT} != "no". -# do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc +# do-compat-lib: builds and installs prerequisites from compat/lib # if ${MKCOMPAT} != "no". # do-build: builds and installs the entire system. # do-x11: builds and installs X11 if ${MKX11} != "no"; either @@ -157,7 +139,8 @@ _SRC_TOP_OBJ_= # _SUBDIR= tools lib include gnu external crypto/external bin games _SUBDIR+= libexec sbin usr.bin -_SUBDIR+= usr.sbin share rescue sys etc tests compat .WAIT distrib regress +_SUBDIR+= usr.sbin share sys etc tests compat +_SUBDIR+= .WAIT rescue .WAIT distrib regress .for dir in ${_SUBDIR} .if "${dir}" == ".WAIT" \ @@ -187,12 +170,15 @@ afterinstall: .PHONY .MAKE ${MAKEDIRTARGET} . postinstall-check .endif -_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall +_POSTINSTALL= ${.CURDIR}/usr.sbin/postinstall/postinstall \ + -m ${MACHINE} -a ${MACHINE_ARCH} _POSTINSTALL_ENV= \ AWK=${TOOL_AWK:Q} \ DB=${TOOL_DB:Q} \ + HOST_SH=${HOST_SH:Q} \ MAKE=${MAKE:Q} \ PWD_MKDB=${TOOL_PWD_MKDB:Q} \ + SED=${TOOL_SED:Q} \ STAT=${TOOL_STAT:Q} postinstall-check: .PHONY @@ -210,22 +196,15 @@ postinstall-fix-obsolete: .NOTMAIN .PHON ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete @echo " ===============================" +postinstall-fix-obsolete_stand: .NOTMAIN .PHONY + @echo " === Removing obsolete files ===" + ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand + @echo " ===============================" + # # Targets (in order!) called by "make build". # -.if defined(HAVE_GCC) -.if ${HAVE_GCC} == "4" -LIBGCC_EXT=4 -BUILD_CC_LIB_BASEDIR= gnu/lib -BUILD_CC_LIB_BASETARGET= gnu-lib -.else -LIBGCC_EXT= -BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib -BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib -.endif -.endif - BUILDTARGETS+= check-tools .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR) BUILDTARGETS+= cleandir @@ -239,6 +218,7 @@ BUILDTARGETS+= do-tools-obj .endif BUILDTARGETS+= do-tools .endif # USETOOLS # } +BUILDTARGETS+= params .if ${MKOBJDIRS} != "no" BUILDTARGETS+= obj .endif @@ -249,33 +229,12 @@ BUILDTARGETS+= do-distrib-dirs .if !defined(NOINCLUDES) BUILDTARGETS+= includes .endif -BUILDTARGETS+= do-tools-compat -BUILDTARGETS+= do-lib-csu -.if ${MKGCC} != "no" -BUILDTARGETS+= do-libgcc -.endif -.if ${MKPCC} != "no" -BUILDTARGET+= do-libpcc -.endif -BUILDTARGETS+= do-lib-libc BUILDTARGETS+= do-lib -.if ${MKKMOD} != "no" -BUILDTARGETS+= do-sys-modules -.endif -.if ${MKRUMP} != "no" -BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib -BUILDTARGETS+= do-sys-rump-kern-lib do-sys-rump-net-lib -.endif -.if ${MKCOMPAT} != "no" -BUILDTARGETS+= do-compat-lib-csu -BUILDTARGETS+= do-compat-libgcc -BUILDTARGETS+= do-compat-lib-libc -.endif -BUILDTARGETS+= do-ld.so -BUILDTARGETS+= do-build +BUILDTARGETS+= do-compat-lib .if ${MKX11} != "no" BUILDTARGETS+= do-x11 .endif +BUILDTARGETS+= do-build .if ${MKEXTSRC} != "no" BUILDTARGETS+= do-extsrc .endif @@ -290,6 +249,32 @@ includes-lib: .PHONY includes-include in includes-gnu: .PHONY includes-lib # +# Record the values of variables that might affect the build. +# If no values have changed, avoid updating the timestamp +# of the params file. +# +# This is referenced by _NETBSD_VERSION_DEPENDS in . +# +.include "${NETBSDSRCDIR}/etc/Makefile.params" +CLEANDIRFILES+= params +params: .EXEC + ${_MKMSG_CREATE} params + @${PRINT_PARAMS} >${.TARGET}.new + @if cmp -s ${.TARGET}.new ${.TARGET} > /dev/null 2>&1; then \ + : "params is unchanged" ; \ + rm ${.TARGET}.new ; \ + else \ + : "params has changed or is new" ; \ + mv ${.TARGET}.new ${.TARGET} ; \ + fi + +# +# Display current make(1) parameters +# +show-params: .PHONY .MAKE + @${PRINT_PARAMS} + +# # Build the system and install into DESTDIR. # @@ -323,6 +308,7 @@ distribution buildworld: .PHONY .MAKE ${MAKEDIRTARGET} etc distribution INSTALL_DONE=1 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/" ${MAKEDIRTARGET} . postinstall-fix-obsolete + ${MAKEDIRTARGET} . postinstall-fix-obsolete_stand ${MAKEDIRTARGET} distrib/sets checkflist .endif @echo "make ${.TARGET} started at: ${START_TIME}" @@ -470,32 +456,14 @@ do-${targ}: .PHONY ${targ} @true .endfor -.if defined(HAVE_GCC) -.if ${USE_COMPILERCRTSTUFF} == "yes" -BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT} -.endif -BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT} -.elif defined(HAVE_PCC) -BUILD_CC_LIB+= external/bsd/pcc/crtstuff -BUILD_CC_LIB+= external/bsd/pcc/libpcc -.endif +do-tools: .PHONY .MAKE + ${MAKEDIRTARGET} tools build_install -.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules -do-${dir:S/\//-/g}: .PHONY .MAKE -.for targ in dependall install - ${MAKEDIRTARGET} ${dir} ${targ} -.endfor -.endfor +do-lib: .PHONY .MAKE + ${MAKEDIRTARGET} lib build_install -.if ${MKCOMPAT} != "no" -COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc -.for dir in ${COMPAT_SUBDIR_LIST} -do-compat-${dir:S/\//-/g}: .PHONY .MAKE -.for targ in dependall install - ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}" -.endfor -.endfor -.endif +do-compat-lib: .PHONY .MAKE + ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib" do-top-obj: .PHONY .MAKE ${MAKEDIRTARGET} . obj NOSUBDIR= @@ -503,41 +471,6 @@ do-top-obj: .PHONY .MAKE do-tools-obj: .PHONY .MAKE ${MAKEDIRTARGET} tools obj -do-libgcc: .PHONY .MAKE -.if defined(HAVE_GCC) -.if ${MKGCC} != "no" -.if ${USE_COMPILERCRTSTUFF} == "yes" - ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT} -.endif - ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT} -.endif -.endif - -do-compat-libgcc: .PHONY .MAKE -.if defined(HAVE_GCC) -.if ${MKGCC} != "no" -.if ${USE_COMPILERCRTSTUFF} == "yes" - ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT} -.endif - ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT} -.endif -.endif - -do-libpcc: .PHONY .MAKE -.if defined(HAVE_PCC) -.if ${MKPCC} != "no" -.if ${USE_COMPILERCRTSTUFF} == "yes" - ${MAKEDIRTARGET} . do-pcc-lib-crtstuff -.endif - ${MAKEDIRTARGET} . do-pcc-lib-libpcc -.endif -.endif - -do-ld.so: .PHONY .MAKE -.for targ in dependall install - ${MAKEDIRTARGET} libexec/ld.elf_so ${targ} -.endfor - do-build: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no @@ -546,7 +479,8 @@ do-build: .PHONY .MAKE do-x11: .PHONY .MAKE .if ${MKX11} != "no" .if ${X11FLAVOUR} == "Xorg" - ${MAKEDIRTARGET} external/mit/xorg build + ${MAKEDIRTARGET} external/mit/xorg/tools all + ${MAKEDIRTARGET} external/mit/xorg/lib build_install .else ${MAKEDIRTARGET} x11 build .endif @@ -587,13 +521,6 @@ install-${dir}: .PHONY dependall-distrib depend-distrib all-distrib: .PHONY @true -.include .include .include .include - -# -# Display current make(1) parameters -# -params: .PHONY .MAKE - ${MAKEDIRTARGET} etc params