ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/src/trunk/Makefile.inc1

Comparing trunk/Makefile.inc1 (file contents):
Revision 6468 by laffer1, Sat Dec 7 23:44:19 2013 UTC vs.
Revision 9189 by laffer1, Mon Oct 17 13:04:37 2016 UTC

#	Line 1 | Line 1
1		#
2	<	# $MidnightBSD: src/Makefile.inc1,v 1.44 2013/01/26 23:05:37 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 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 \
330	>	LIB32WMAKE=     ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
331		-DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_INFO \
332	<	-DWITHOUT_HTML -DNO_CTF -DNO_LINT -ECC -ECXX -EAS -ELD \
332	>	-DWITHOUT_HTML -DNO_CTF -DNO_LINT \
333		DESTDIR=${LIB32TMP}
334	<	LIB32IMAKE=     ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS
334	>	LIB32IMAKE=     ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
335	>	${IMAKE_INSTALL}
336		.endif
337
315	–	# install stage
338		IMAKEENV=       ${CROSSENV:N_LDSCRIPTROOT=*}
339	<	IMAKE=          ${IMAKEENV} ${MAKE} -f Makefile.inc1
339	>	IMAKE=          ${IMAKEENV} ${MAKE} -f Makefile.inc1 \
340	>	${IMAKE_INSTALL} ${IMAKE_MTREE}
341		.if empty(.MAKEFLAGS:M-n)
342		IMAKEENV+=      PATH=${STRICTTMPPATH}:${INSTALLTMP} \
343		LD_LIBRARY_PATH=${INSTALLTMP} \
#	Line 323 | Line 346 | IMAKE+=                __MAKE_SHELL=${INSTALLTMP}/sh
346		.else
347		IMAKEENV+=      PATH=${TMPPATH}:${INSTALLTMP}
348		.endif
349	+	.if defined(DB_FROM_SRC)
350	+	IMAKE_INSTALL=  INSTALL="install -N ${.CURDIR}/etc"
351	+	IMAKE_MTREE=    MTREE_CMD="nmtree -N ${.CURDIR}/etc"
352	+	.endif
353
354		# kernel stage
355		KMAKEENV=       ${WMAKEENV}
#	Line 360 | Line 387 | _worldtmp:
387		rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
388		.endif
389		.for _dir in \
390	<	lib usr legacy/usr
390	>	lib usr legacy/usr legacy/usr/bin legacy/usr/sbin
391		mkdir -p ${WORLDTMP}/${_dir}
392		.endfor
393		mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
#	Line 378 | Line 405 | _worldtmp:
405		mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
406		-p ${WORLDTMP}/usr/include >/dev/null
407		.endif
408	+	.for _mtree in ${LOCAL_MTREE}
409	+	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
410	+	.endfor
411		_legacy:
412		@echo
413		@echo "--------------------------------------------------------------"
#	Line 458 | Line 488 | build32:
488		-p ${LIB32TMP}/usr/include >/dev/null
489		mkdir -p ${WORLDTMP}
490		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
491		.for _t in obj includes
492		cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
493		cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
#	Line 487 | Line 510 | build32:
510		.endfor
511		.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
512		cd ${.CURDIR}/${_dir}; \
513	+	WORLDTMP=${WORLDTMP} \
514		MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
515		DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
516		-DEARLY_BUILD build-tools
#	Line 569 | Line 593 | kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_librar
593		installcheck:
594
595		#
596	<	# Require DESTDIR to be set if installing for a different architecture.
596	>	# Require DESTDIR to be set if installing for a different architecture or
597	>	# using the user/group database in the source tree.
598		#
599	<	.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE}
599	>	.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
600	>	defined(DB_FROM_SRC)
601		.if !make(distributeworld)
602		installcheck: installcheck_DESTDIR
603		installcheck_DESTDIR:
#	Line 582 | Line 608 | installcheck_DESTDIR:
608		.endif
609		.endif
610
611	+	.if !defined(DB_FROM_SRC)
612		#
613		# Check for missing UIDs/GIDs.
614		#
615	<	CHECK_UIDS=
615	>	CHECK_UIDS=     auditdistd
616		CHECK_GIDS=     audit
617		.if ${MK_SENDMAIL} != "no"
618		CHECK_UIDS+=    smmsp
#	Line 609 | Line 636 | installcheck_UGID:
636		false; \
637		fi
638		.endfor
639	+	.endif
640
641		#
642		# Required install tools to be saved in a scratch dir for safety.
#	Line 620 | Line 648 | _install-info= install-info
648		_zoneinfo=      zic tzsetup
649		.endif
650
651	+	.if exists(/usr/sbin/nmtree)
652	+	_nmtree_itools= nmtree
653	+	.endif
654	+
655		ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
656		date echo egrep find grep ${_install-info} \
657	<	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
658	<	test true uname wc ${_zoneinfo}
657	>	ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
658	>	rm sed sh sysctl test true uname wc ${_zoneinfo}
659
660		#
661		# distributeworld
#	Line 636 | Line 668 | ITOOLS=        [ awk cap_mkdb cat chflags chmod chown \
668		#
669
670		# Non-base distributions produced by the base system
671	<	EXTRA_DISTRIBUTIONS=    doc games
671	>	EXTRA_DISTRIBUTIONS=    doc
672	>	.if ${MK_GAMES} != "no"
673	>	EXTRA_DISTRIBUTIONS+=   games
674	>	.endif
675		.if defined(LIB32TMP) && ${MK_LIB32} != "no"
676		EXTRA_DISTRIBUTIONS+=   lib32
677		.endif
#	Line 675 | Line 710 | distributeworld installworld: installcheck
710		.endfor
711		-mkdir ${DESTDIR}/${DISTDIR}/base
712		${_+_}cd ${.CURDIR}; ${IMAKE} distrib-dirs \
713	<	DESTDIR=${DESTDIR}/${DISTDIR}/base
713	>	LOCAL_MTREE=${LOCAL_MTREE} DESTDIR=${DESTDIR}/${DISTDIR}/base
714		.endif
715		${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
716		${IMAKEENV} rm -rf ${INSTALLTMP}
#	Line 702 | Line 737 | reinstall:
737		@echo "--------------------------------------------------------------"
738		@echo ">>> Making hierarchy"
739		@echo "--------------------------------------------------------------"
740	<	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy
740	>	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
741	>	LOCAL_MTREE=${LOCAL_MTREE} hierarchy
742		@echo
743		@echo "--------------------------------------------------------------"
744		@echo ">>> Installing everything"
#	Line 723 | Line 759 | redistribute:
759		.endif
760
761		distrib-dirs distribution:
762	<	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} ${.TARGET}
762	>	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
763	>	${IMAKE_INSTALL} ${IMAKE_MTREE} ${.TARGET}
764
765		#
766		# buildkernel and installkernel
#	Line 871 | Line 908 | reinstallkernel reinstallkernel.debug: installcheck
908		@echo "--------------------------------------------------------------"
909		cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
910		${CROSSENV} PATH=${TMPPATH} \
911	<	${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
911	>	${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
912
913		distributekernel distributekernel.debug:
914		.if empty(INSTALLKERNEL)
#	Line 973 | Line 1010 | update:
1010		# legacy: Build compatibility shims for the next three targets
1011		#
1012		legacy:
1013	<	.if ${BOOTSTRAPPING} < 1000 && ${BOOTSTRAPPING} != 0
1014	<	@echo "ERROR: Source upgrades from versions prior to 0.1 not supported."; \
1013	>	.if ${BOOTSTRAPPING} < 7000 && ${BOOTSTRAPPING} != 0
1014	>	@echo "ERROR: Source upgrades from versions prior to 0.7 not supported."; \
1015		false
1016		.endif
1017	+	mkdir -p ${MAKEOBJDIRPREFIX}/legacy/usr/bin
1018		.for _tool in tools/build
1019		${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
1020	<	cd ${.CURDIR}/${_tool}; \
1021	<	${MAKE} DIRPRFX=${_tool}/ obj; \
1022	<	${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
1023	<	${MAKE} DIRPRFX=${_tool}/ depend; \
1024	<	${MAKE} DIRPRFX=${_tool}/ all; \
1020	>	cd ${.CURDIR}/${_tool} && \
1021	>	${MAKE} DIRPRFX=${_tool}/ obj && \
1022	>	${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
1023	>	${MAKE} DIRPRFX=${_tool}/ depend && \
1024	>	${MAKE} DIRPRFX=${_tool}/ all && \
1025		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
1026		.endfor
1027
#	Line 1014 | Line 1052 | _mklocale=     usr.bin/mklocale
1052		_sed=           usr.bin/sed
1053		.endif
1054
1055	<	.if ${BOOTSTRAPPING} < 4015
1055	>	.if ${BOOTSTRAPPING} < 7003
1056	>	_m4=            usr.bin/m4
1057	>	.endif
1058	>
1059	>	.if ${BOOTSTRAPPING} < 7003
1060		_lex=           usr.bin/lex
1061		.endif
1062
1063	<	.if ${BOOTSTRAPPING} < 4015
1064	<	_yacc=          usr.bin/yacc
1063	>	.if ${BOOTSTRAPPING} < 7003
1064	>	_yacc=          lib/liby \
1065	>	usr.bin/yacc
1066		.endif
1067
1068	+	.if ${BOOTSTRAPPING} < 9002
1069	+	_nmtree=       lib/libnetbsd \
1070	+	usr.sbin/nmtree
1071	+	.endif
1072	+
1073	+
1074		.if ${MK_BSNMP} != "no" && \
1075		(${BOOTSTRAPPING} < 4015 || !exists(/usr/sbin/gensnmptree))
1076		_gensnmptree=   usr.sbin/bsnmpd/gensnmptree
#	Line 1057 | Line 1106 | _dtc= gnu/usr.bin/dtc
1106		bootstrap-tools:
1107		.for _tool in \
1108		${_clang_tblgen} \
1109	+	${_kerberos5_bootstrap_tools} \
1110		${_dtrace_tools} \
1111		${_strfile} \
1112		${_gperf} \
#	Line 1070 | Line 1120 | bootstrap-tools:
1120		usr.bin/rpcgen \
1121		${_sed} \
1122		${_yacc} \
1123	+	${_m4} \
1124		${_lex} \
1125	+	lib/libmd \
1126		usr.bin/xinstall \
1127		${_gensnmptree} \
1128		usr.sbin/config \
1129	<	${_crunchgen}
1129	>	${_crunchgen} \
1130	>	${_nmtree}
1131		${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
1132		cd ${.CURDIR}/${_tool}; \
1133		${MAKE} DIRPRFX=${_tool}/ obj; \
#	Line 1094 | Line 1147 | _aicasm= sys/modules/aic7xxx/aicasm
1147		_share= share/syscons/scrnmaps
1148		.endif
1149
1150	<	.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
1150	>	.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
1151		_gcc_tools= gnu/usr.bin/cc/cc_tools
1152		.endif
1153
1154		.if ${MK_KERBEROS} != "no"
1155	<	_kerberos5_tools= kerberos5/tools
1155	>	_kerberos5_bootstrap_tools= \
1156	>	kerberos5/tools/make-roken \
1157	>	kerberos5/lib/libroken \
1158	>	kerberos5/lib/libvers \
1159	>	kerberos5/tools/asn1_compile \
1160	>	kerberos5/tools/slc \
1161	>	usr.bin/compile_et
1162	>
1163	>	.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
1164		.endif
1165
1166		.if ${MK_RESCUE} != "no"
#	Line 1127 | Line 1188 | build-tools:
1188		.endfor
1189		.for _tool in \
1190		${_gcc_tools} \
1191	<	${_kerberos5_tools}
1192	<	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
1193	<	cd ${.CURDIR}/${_tool}; \
1194	<	${MAKE} DIRPRFX=${_tool}/ obj; \
1195	<	${MAKE} DIRPRFX=${_tool}/ depend; \
1196	<	${MAKE} DIRPRFX=${_tool}/ all
1191	>	${_kerberos5_bootstrap_tools}
1192	>	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
1193	>	cd ${.CURDIR}/${_tool} && \
1194	>	${MAKE} DIRPRFX=${_tool}/ obj && \
1195	>	${MAKE} DIRPRFX=${_tool}/ depend && \
1196	>	${MAKE} DIRPRFX=${_tool}/ all && \
1197	>	${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install
1198		.endfor
1199
1200		#
#	Line 1161 | Line 1223 | _clang=                usr.bin/clang
1223		_clang_libs=    lib/clang
1224		.endif
1225
1226	<	.if ${MK_GCC} != "no" && ${MK_CLANG_IS_CC} == "no"
1226	>	.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
1227		_cc=            gnu/usr.bin/cc
1228		.endif
1229
#	Line 1187 | Line 1249 | cross-tools:
1249		# hierarchy - ensure that all the needed directories are present
1250		#
1251		hierarchy:
1252	<	cd ${.CURDIR}/etc;              ${MAKE} distrib-dirs
1252	>	cd ${.CURDIR}/etc; ${MAKE} LOCAL_MTREE=${LOCAL_MTREE} distrib-dirs
1253
1254		#
1255		# libraries - build all libraries, and install them under ${DESTDIR}.
#	Line 1233 | Line 1295 | gnu/lib/libgcc__L: lib/libc__L
1295		lib/libcxxrt__L: gnu/lib/libgcc__L
1296		.endif
1297
1298	<	_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \
1298	>	_prebuild_libs= ${_kerberos5_lib_libasn1} \
1299	>	${_kerberos5_lib_libhdb} \
1300	>	${_kerberos5_lib_libheimbase} \
1301		${_kerberos5_lib_libheimntlm} \
1302	+	${_kerberos5_lib_libheimsqlite} \
1303	+	${_kerberos5_lib_libheimipcc} \
1304		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
1305		${_kerberos5_lib_libroken} \
1306	+	${_kerberos5_lib_libwind} \
1307		lib/libbz2 lib/libcom_err lib/libcrypt \
1308	<	lib/libexpat \
1308	>	lib/libelf lib/libexpat \
1309		${_lib_libgssapi} ${_lib_libipx} \
1310		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
1311		lib/ncurses/ncurses lib/ncurses/ncursesw \
1312		lib/libopie lib/libpam ${_lib_libthr} \
1313		lib/libradius lib/libsbuf lib/libtacplus \
1314	<	${_cddl_lib_libumem} \
1314	>	${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
1315	>	${_cddl_lib_libzfs_core} \
1316		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
1317		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
1318		${_secure_lib_libssl} lib/libsqlite3 \
1319	<	lib/libarchive lib/libfetch lib/libmagic
1319	>	lib/libarchive lib/libfetch lib/libmagic \
1320	>	lib/libblocksruntime
1321		.if ${MK_LIBTHR} != "no"
1322		_lib_libthr=    lib/libthr
1323		.endif
#	Line 1267 | Line 1336 | _apache_lib= apache/lib
1336
1337		.if ${MK_CDDL} != "no"
1338		_cddl_lib_libumem= cddl/lib/libumem
1339	+	_cddl_lib_libnvpair= cddl/lib/libnvpair
1340	+	_cddl_lib_libzfs_core= cddl/lib/libzfs_core
1341		_cddl_lib= cddl/lib
1342	+	cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
1343		.endif
1344
1345		.if ${MK_CRYPT} != "no"
#	Line 1291 | Line 1363 | _secure_lib=   secure/lib
1363		.if ${MK_KERBEROS} != "no"
1364		kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
1365		kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1366	<	kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L
1367	<	kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L
1366	>	kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
1367	>	kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L
1368	>	kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
1369	>	kerberos5/lib/libroken__L lib/libcom_err__L
1370		kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1371	<	secure/lib/libcrypto__L kerberos5/lib/libroken__L
1371	>	secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwind__L
1372		kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
1373		lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
1374	<	kerberos5/lib/libroken__L
1374	>	kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
1375	>	kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
1376		kerberos5/lib/libroken__L: lib/libcrypt__L
1377	+	kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
1378	+	kerberos5/lib/libheimbase__L: lib/libthr__L
1379	+	kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
1380	+	kerberos5/lib/libheimsqlite__L: lib/libthr__L
1381		.endif
1382
1383		.if ${MK_GSSAPI} != "no"
#	Line 1310 | Line 1389 | _lib_libipx=   lib/libipx
1389		.endif
1390
1391		.if ${MK_KERBEROS} != "no"
1392	<	_kerberos5_lib= kerberos5/lib
1392	>	_kerberos5_lib= kerberos5/lib
1393		_kerberos5_lib_libasn1= kerberos5/lib/libasn1
1394		_kerberos5_lib_libhdb= kerberos5/lib/libhdb
1395	+	_kerberos5_lib_libheimbase= kerberos5/lib/libheimbase
1396		_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
1397		_kerberos5_lib_libhx509= kerberos5/lib/libhx509
1398		_kerberos5_lib_libroken= kerberos5/lib/libroken
1399		_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
1400	+	_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
1401	+	_kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
1402	+	_kerberos5_lib_libwind= kerberos5/lib/libwind
1403	+	_libcom_err= lib/libcom_err
1404		.endif
1405
1406		.if ${MK_NIS} != "no"
#	Line 1328 | Line 1412 | lib/libradius__L: lib/libmd__L
1412		.endif
1413
1414		.for _lib in ${_prereq_libs}
1415	<	${_lib}__PL: .PHONY
1415	>	${_lib}__PL: .PHONY .MAKE
1416		.if exists(${.CURDIR}/${_lib})
1417		${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
1418	<	cd ${.CURDIR}/${_lib}; \
1419	<	${MAKE} DIRPRFX=${_lib}/ obj; \
1420	<	${MAKE} DIRPRFX=${_lib}/ depend; \
1421	<	${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
1418	>	cd ${.CURDIR}/${_lib} && \
1419	>	${MAKE} DIRPRFX=${_lib}/ obj && \
1420	>	${MAKE} DIRPRFX=${_lib}/ depend && \
1421	>	${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
1422		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
1423		.endif
1424		.endfor
#	Line 1343 | Line 1427 | ${_lib}__PL: .PHONY
1427		${_lib}__L: .PHONY
1428		.if exists(${.CURDIR}/${_lib})
1429		${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
1430	<	cd ${.CURDIR}/${_lib}; \
1431	<	${MAKE} DIRPRFX=${_lib}/ obj; \
1432	<	${MAKE} DIRPRFX=${_lib}/ depend; \
1433	<	${MAKE} DIRPRFX=${_lib}/ all; \
1430	>	cd ${.CURDIR}/${_lib} && \
1431	>	${MAKE} DIRPRFX=${_lib}/ obj && \
1432	>	${MAKE} DIRPRFX=${_lib}/ depend && \
1433	>	${MAKE} DIRPRFX=${_lib}/ all && \
1434		${MAKE} DIRPRFX=${_lib}/ install
1435		.endif
1436		.endfor
#	Line 1525 | Line 1609 | DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
1609		.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
1610		.if exists(${KERNCONFDIR}/${KERNCONF})
1611		FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
1612	<	${KERNCONFDIR}/${KERNCONF}
1612	>	${KERNCONFDIR}/${KERNCONF} ; echo
1613		.endif
1614		.endif
1615
#	Line 1575 | Line 1659 | NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LI
1659
1660		XDDIR=${XDEV_ARCH}-midnightbsd
1661		XDTP=/usr/${XDDIR}
1662	<	CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
1662	>	CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
1663	>	INSTALL="sh ${.CURDIR}/tools/install.sh"
1664		CDENV= ${CDBENV} \
1665		_SHLIBDIRPREFIX=${XDTP} \
1666		TOOLS_PREFIX=${XDTP}

Comparing trunk/Makefile.inc1 (property svn:keywords):
Revision 6468 by laffer1, Sat Dec 7 23:44:19 2013 UTC vs.
Revision 9189 by laffer1, Mon Oct 17 13:04:37 2016 UTC

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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines