PERFORCE change 142349 for review
John Birrell
jb at FreeBSD.org
Tue May 27 03:36:17 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142349
Change 142349 by jb at freebsd3 on 2008/05/27 03:35:44
Add the DTrace build stuff.
Affected files ...
.. //depot/projects/dtrace7/src/Makefile.inc1#8 edit
Differences ...
==== //depot/projects/dtrace7/src/Makefile.inc1#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.588.2.4 2008/02/24 14:31:41 remko Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -167,14 +167,7 @@
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
-#
-# Avoid running mktemp(1) unless actually needed.
-# It may not be functional, e.g., due to new ABI
-# when in the middle of installing over this system.
-#
-.if make(distributeworld) || make(installworld)
INSTALLTMP!= /usr/bin/mktemp -d -u -t install
-.endif
#
# Building a world goes through the following stages
@@ -211,9 +204,6 @@
GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
-.if ${OSRELDATE} < 700044
-CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib
-.endif
# bootstrap-tools stage
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -290,16 +280,14 @@
.endif
# install stage
-IMAKEENV= ${CROSSENV}
-IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
.if empty(.MAKEFLAGS:M-n)
-IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \
- LD_LIBRARY_PATH=${INSTALLTMP} \
- PATH_LOCALE=${INSTALLTMP}/locale
-IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh
+IMAKEENV= ${CROSSENV} \
+ PATH=${STRICTTMPPATH}:${INSTALLTMP}
.else
-IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP}
+IMAKEENV= ${CROSSENV} \
+ PATH=${TMPPATH}:${INSTALLTMP}
.endif
+IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
# kernel stage
KMAKEENV= ${WMAKEENV}
@@ -597,14 +585,6 @@
.endfor
#
-# Required install tools to be saved in a scratch dir for safety.
-#
-ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
- date echo egrep find grep install-info \
- ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
- test true uname wc zic
-
-#
# distributeworld
#
# Distributes everything compiled by a `buildworld'.
@@ -615,28 +595,14 @@
#
distributeworld installworld: installcheck
mkdir -p ${INSTALLTMP}
- progs=$$(for prog in ${ITOOLS}; do \
- if progpath=`which $$prog`; then \
- echo $$progpath; \
- else \
- echo "Required tool $$prog not found in PATH." >&2; \
- exit 1; \
- fi; \
- done); \
- libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
- while read line; do \
- set -- $$line; \
- if [ "$$2 $$3" != "not found" ]; then \
- echo $$2; \
- else \
- echo "Required library $$1 not found." >&2; \
- exit 1; \
- fi; \
- done); \
- cp $$libs $$progs ${INSTALLTMP}
- cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
- ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
- ${IMAKEENV} rm -rf ${INSTALLTMP}
+ for prog in [ awk cap_mkdb cat chflags chmod chown \
+ date echo egrep find grep install-info \
+ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
+ test true uname wc zic; do \
+ cp `which $$prog` ${INSTALLTMP}; \
+ done
+ ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
+ rm -rf ${INSTALLTMP}
#
# reinstall
@@ -866,8 +832,8 @@
# legacy: Build compatibility shims for the next three targets
#
legacy:
-.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
- @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \
+.if ${BOOTSTRAPPING} < 503000
+ @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \
false
.endif
.for _tool in tools/build
@@ -896,11 +862,23 @@
.endif
.endif
-.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
-_ar= usr.bin/ar
+.if ${BOOTSTRAPPING} < 600029
+_texinfo= gnu/usr.bin/texinfo
+.endif
+
+.if ${BOOTSTRAPPING} < 600015
+_cap_mkdb= usr.bin/cap_mkdb
+.endif
+
+.if ${BOOTSTRAPPING} < 600018
+_colldef= usr.bin/colldef
+.endif
+
+.if ${BOOTSTRAPPING} < 600017
+_gencat= usr.bin/gencat
.endif
-.if ${BOOTSTRAPPING} < 800013
+.if ${BOOTSTRAPPING} < 600016
_mklocale= usr.bin/mklocale
.endif
@@ -913,6 +891,9 @@
_crunchgen= usr.sbin/crunch/crunchgen
.endif
+.if ${BOOTSTRAPPING} < 600020
+_pwd_mkdb= usr.sbin/pwd_mkdb
+.endif
.if ${MK_CDDL} != "no"
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
@@ -925,7 +906,10 @@
${_strfile} \
${_gperf} \
${_groff} \
- ${_ar} \
+ ${_texinfo} \
+ ${_cap_mkdb} \
+ ${_colldef} \
+ ${_gencat} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
@@ -933,7 +917,8 @@
usr.bin/xinstall \
${_gensnmptree} \
usr.sbin/config \
- ${_crunchgen}
+ ${_crunchgen} \
+ ${_pwd_mkdb}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -991,12 +976,10 @@
#
# cross-tools: Build cross-building tools
#
-.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld= usr.sbin/btxld
.endif
-.endif
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
_crunchide= usr.sbin/crunch/crunchide
.endif
@@ -1064,21 +1047,23 @@
gnu/lib/libgcc__L: lib/libc__L
_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
- ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \
- ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \
- lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
- lib/libexpat \
- ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
+ ${_kerberos5_lib_libroken} \
+ lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
+ ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam ${_lib_libthr} \
+ lib/libopie lib/libpam ${_default_thread_lib} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
- ${_secure_lib_libssl} lib/libdwarf lib/libproc
+ ${_secure_lib_libssl}
-.if ${MK_LIBTHR} != "no"
-_lib_libthr= lib/libthr
+.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
+_default_thread_lib= lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib= lib/libthr
+.elif ${MK_LIBKSE} != "no"
+_default_thread_lib= lib/libkse
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
@@ -1098,11 +1083,9 @@
_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
.if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
- kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
- lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
- lib/libcrypt__L
-secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
+secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
+ kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \
+ kerberos5/lib/libroken__L
.endif
.endif
.endif
@@ -1117,10 +1100,7 @@
_kerberos5_lib= kerberos5/lib
_kerberos5_lib_libasn1= kerberos5/lib/libasn1
_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
-_kerberos5_lib_libhx509= kerberos5/lib/libhx509
_kerberos5_lib_libroken= kerberos5/lib/libroken
-_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
_lib_libgssapi= lib/libgssapi
.endif
More information about the p4-projects
mailing list