1998-08-31 01:08:08 +00:00
|
|
|
#
|
1999-08-28 01:35:59 +00:00
|
|
|
# $FreeBSD$
|
1998-08-31 01:08:08 +00:00
|
|
|
#
|
|
|
|
|
# Make command line options:
|
|
|
|
|
# -DMAKE_KERBEROS4 to build KerberosIV
|
2000-02-20 09:13:30 +00:00
|
|
|
# -DMAKE_KERBEROS5 to build Kerberos5
|
1998-08-31 01:08:08 +00:00
|
|
|
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
|
|
|
|
|
# -DNOCLEAN do not clean at all
|
|
|
|
|
# -DNOCRYPT will prevent building of crypt versions
|
|
|
|
|
# -DNOPROFILE do not build profiled libraries
|
|
|
|
|
# -DNOSECURE do not go into secure subdir
|
|
|
|
|
# -DNOGAMES do not go into games subdir
|
|
|
|
|
# -DNOSHARE do not go into share subdir
|
|
|
|
|
# -DNOINFO do not make or install info files
|
|
|
|
|
# -DNOLIBC_R do not build libc_r.
|
1999-05-03 17:54:59 +00:00
|
|
|
# -DNO_FORTRAN do not build g77 and related libraries.
|
2000-06-15 10:00:20 +00:00
|
|
|
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
|
2001-01-22 23:29:13 +00:00
|
|
|
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
|
2000-06-15 10:00:20 +00:00
|
|
|
# -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
|
2000-08-07 14:35:49 +00:00
|
|
|
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
|
|
|
|
|
# -DNO_DOCUPDATE do not update doc in ${MAKE} update
|
1998-08-31 01:08:08 +00:00
|
|
|
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
# TARGET_ARCH="arch" to crossbuild world to a different arch
|
1998-08-31 01:08:08 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# The intended user-driven targets are:
|
|
|
|
|
# buildworld - rebuild *everything*, including glue to help do upgrades
|
|
|
|
|
# installworld- install everything built by "buildworld"
|
|
|
|
|
# update - convenient way to update your source tree (eg: sup/cvs)
|
|
|
|
|
# most - build user commands, no libraries or include files
|
|
|
|
|
# installmost - install user commands, no libraries or include files
|
|
|
|
|
#
|
|
|
|
|
# Standard targets (not defined here) are documented in the makefiles in
|
|
|
|
|
# /usr/share/mk. These include:
|
|
|
|
|
# obj depend all install clean cleandepend cleanobj
|
|
|
|
|
|
|
|
|
|
# Put initial settings here.
|
|
|
|
|
SUBDIR=
|
|
|
|
|
|
|
|
|
|
# We must do share/info early so that installation of info `dir'
|
|
|
|
|
# entries works correctly. Do it first since it is less likely to
|
|
|
|
|
# grow dependencies on include and lib than vice versa.
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/share/info)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= share/info
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
# We must do include and lib early so that the perl *.ph generation
|
|
|
|
|
# works correctly as it uses the header files installed by this.
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/include)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= include
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/lib)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= lib
|
|
|
|
|
.endif
|
|
|
|
|
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/bin)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= bin
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/games) && !defined(NOGAMES)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= games
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/gnu)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= gnu
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
|
2000-03-09 06:29:05 +00:00
|
|
|
!defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= kerberosIV
|
|
|
|
|
.endif
|
2000-01-24 20:11:53 +00:00
|
|
|
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
|
2000-03-09 06:29:05 +00:00
|
|
|
!defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5)
|
2000-01-24 20:11:53 +00:00
|
|
|
SUBDIR+= kerberos5
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/libexec)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= libexec
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/sbin)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= sbin
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/share) && !defined(NOSHARE)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= share
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/sys)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= sys
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/usr.bin)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= usr.bin
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/usr.sbin)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= usr.sbin
|
|
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= secure
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
# etc must be last for "distribute" to work
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/etc)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= etc
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
# These are last, since it is nice to at least get the base system
|
|
|
|
|
# rebuilt before you do them.
|
|
|
|
|
.if defined(LOCAL_DIRS)
|
|
|
|
|
.for _DIR in ${LOCAL_DIRS}
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/${_DIR}) & exists(${.CURDIR}/${_DIR}/Makefile)
|
1998-08-31 01:08:08 +00:00
|
|
|
SUBDIR+= ${_DIR}
|
|
|
|
|
.endif
|
|
|
|
|
.endfor
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
.if defined(NOCLEANDIR)
|
|
|
|
|
CLEANDIR= clean cleandepend
|
|
|
|
|
.else
|
|
|
|
|
CLEANDIR= cleandir
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
SUP?= cvsup
|
|
|
|
|
SUPFLAGS?= -g -L 2 -P -
|
2000-08-13 12:36:40 +00:00
|
|
|
.if defined(SUPHOST)
|
|
|
|
|
SUPFLAGS+= -h ${SUPHOST}
|
|
|
|
|
.endif
|
1998-08-31 01:08:08 +00:00
|
|
|
|
1999-12-10 10:48:20 +00:00
|
|
|
MAKEOBJDIRPREFIX?= /usr/obj
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
TARGET_ARCH?= ${MACHINE_ARCH}
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
.if make(buildworld)
|
1999-12-10 10:48:20 +00:00
|
|
|
BUILD_ARCH!= sysctl -n hw.machine_arch
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
.if ${MACHINE_ARCH} != ${BUILD_ARCH}
|
|
|
|
|
.error To cross-build, set TARGET_ARCH.
|
|
|
|
|
.endif
|
|
|
|
|
.endif
|
|
|
|
|
.if ${MACHINE_ARCH} == ${TARGET_ARCH}
|
1999-12-11 17:05:36 +00:00
|
|
|
OBJTREE= ${MAKEOBJDIRPREFIX}
|
|
|
|
|
.else
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET_ARCH}
|
1999-12-11 17:05:36 +00:00
|
|
|
.endif
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
|
1999-12-23 19:18:28 +00:00
|
|
|
# /usr/games added for fortune which depend on strfile
|
Revert previous commit, and
o Add genassym to the list of cross-tools
o Remove sh hashing work-around, we don't need it anymore
o Clean more directories in WORLDTMP when NOCLEAN is specified
The sh hashing work-around is not needed anymore, because we don't
trigger the bug anymore.
When NOCLEAN is not defined, we wipe out the complete WORLDTMP,
including the object directories of the tools we have built. When
NOCLEAN is defined, we remove anything that we install anyway, which
is usr/bin, usr/games, usr/include, usr/lib and usr/sbin.
1999-12-23 11:25:34 +00:00
|
|
|
STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
|
1998-10-17 11:56:20 +00:00
|
|
|
TMPPATH= ${STRICTTMPPATH}:${PATH}
|
2001-01-22 08:07:58 +00:00
|
|
|
OBJFORMAT_PATH?= /usr/libexec
|
1998-08-31 01:08:08 +00:00
|
|
|
|
2000-07-19 04:41:59 +00:00
|
|
|
TMPDIR?= /tmp
|
|
|
|
|
TMPPID!= echo $$$$
|
|
|
|
|
INSTALLTMP= ${TMPDIR}/install.${TMPPID}
|
|
|
|
|
|
1999-12-20 10:32:11 +00:00
|
|
|
#
|
|
|
|
|
# Building a world goes through the following stages
|
|
|
|
|
#
|
2000-10-13 01:19:36 +00:00
|
|
|
# 1. bootstrap-tool stage [BMAKE]
|
1999-12-20 10:32:11 +00:00
|
|
|
# This stage is responsible for creating programs that
|
|
|
|
|
# are needed for backward compatibility reasons. They
|
|
|
|
|
# are not built as cross-tools.
|
2000-10-13 01:19:36 +00:00
|
|
|
# 2. build-tool stage [TMAKE]
|
1999-12-20 10:32:11 +00:00
|
|
|
# This stage is responsible for creating the object
|
|
|
|
|
# tree and building any tools that are needed during
|
|
|
|
|
# the build process.
|
2000-10-13 01:19:36 +00:00
|
|
|
# 3. cross-tool stage [XMAKE]
|
1999-12-20 10:32:11 +00:00
|
|
|
# This stage is responsible for creating any tools that
|
|
|
|
|
# are needed for cross-builds. A cross-compiler is one
|
|
|
|
|
# of them.
|
2000-10-13 01:19:36 +00:00
|
|
|
# 4. world stage [WMAKE]
|
1999-12-20 10:32:11 +00:00
|
|
|
# This stage actually builds the world.
|
2000-10-13 01:19:36 +00:00
|
|
|
# 5. install stage (optional) [IMAKE]
|
1999-12-20 10:32:11 +00:00
|
|
|
# This stage installs a previously built world.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Common environment for world related stages
|
|
|
|
|
CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
MACHINE_ARCH=${TARGET_ARCH} \
|
1999-12-20 10:32:11 +00:00
|
|
|
COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
|
1999-12-08 13:45:11 +00:00
|
|
|
LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib \
|
|
|
|
|
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
|
2001-06-11 18:09:08 +00:00
|
|
|
CFLAGS="-nostdinc ${CFLAGS}" \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
CXXINCLUDES="-nostdinc++ ${CXXINCLUDES}" \
|
2001-04-18 12:20:28 +00:00
|
|
|
PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.6.0 \
|
|
|
|
|
GROFF_BIN_PATH=${WORLDTMP}/usr/bin \
|
|
|
|
|
GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
|
|
|
|
|
GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac
|
1999-12-09 16:40:27 +00:00
|
|
|
|
1999-12-20 10:32:11 +00:00
|
|
|
# bootstrap-tool stage
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \
|
|
|
|
|
DESTDIR= \
|
|
|
|
|
INSTALL="sh ${.CURDIR}/tools/install.sh"
|
2001-09-17 11:50:36 +00:00
|
|
|
BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \
|
|
|
|
|
-DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED
|
1999-12-20 10:32:11 +00:00
|
|
|
|
|
|
|
|
# build-tool stage
|
|
|
|
|
TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
DESTDIR= \
|
|
|
|
|
INSTALL="sh ${.CURDIR}/tools/install.sh"
|
1999-12-20 10:32:11 +00:00
|
|
|
TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1
|
|
|
|
|
|
|
|
|
|
# cross-tool stage
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
|
1999-12-20 10:32:11 +00:00
|
|
|
|
|
|
|
|
# world stage
|
|
|
|
|
WMAKEENV= ${CROSSENV} \
|
1999-12-10 10:48:20 +00:00
|
|
|
DESTDIR=${WORLDTMP} \
|
2000-01-11 16:23:51 +00:00
|
|
|
INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
1999-12-10 10:48:20 +00:00
|
|
|
PATH=${TMPPATH}
|
2001-06-13 15:18:11 +00:00
|
|
|
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1
|
1999-12-08 13:45:11 +00:00
|
|
|
|
1999-12-20 10:32:11 +00:00
|
|
|
# install stage
|
2000-07-18 01:49:05 +00:00
|
|
|
IMAKEENV= ${CROSSENV} \
|
2000-07-19 04:41:59 +00:00
|
|
|
PATH=${STRICTTMPPATH}:${INSTALLTMP}
|
1999-12-10 10:48:20 +00:00
|
|
|
IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
|
|
|
|
|
|
2001-01-22 08:07:58 +00:00
|
|
|
# kernel stage
|
|
|
|
|
KMAKEENV= ${WMAKEENV} \
|
|
|
|
|
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:${OBJFORMAT_PATH}
|
|
|
|
|
|
1999-12-10 10:48:20 +00:00
|
|
|
USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
|
2001-04-18 12:20:28 +00:00
|
|
|
usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc \
|
|
|
|
|
usr/share/dict \
|
|
|
|
|
usr/share/groff_font/devX100 \
|
|
|
|
|
usr/share/groff_font/devX100-12 \
|
|
|
|
|
usr/share/groff_font/devX75 \
|
|
|
|
|
usr/share/groff_font/devX75-12 \
|
|
|
|
|
usr/share/groff_font/devascii \
|
|
|
|
|
usr/share/groff_font/devcp1047 \
|
|
|
|
|
usr/share/groff_font/devdvi \
|
|
|
|
|
usr/share/groff_font/devhtml \
|
|
|
|
|
usr/share/groff_font/devkoi8-r \
|
|
|
|
|
usr/share/groff_font/devlatin1 \
|
|
|
|
|
usr/share/groff_font/devlbp \
|
|
|
|
|
usr/share/groff_font/devlj4 \
|
|
|
|
|
usr/share/groff_font/devps \
|
|
|
|
|
usr/share/groff_font/devutf8 \
|
|
|
|
|
usr/share/tmac/mdoc usr/share/tmac/mm
|
1999-12-10 10:48:20 +00:00
|
|
|
|
2001-04-24 02:57:42 +00:00
|
|
|
INCDIRS= arpa g++/std isc objc protocols readline rpc rpcsvc openssl \
|
2001-08-26 17:47:21 +00:00
|
|
|
security
|
1998-08-31 01:08:08 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# buildworld
|
|
|
|
|
#
|
|
|
|
|
# Attempt to rebuild the entire system, with reasonable chance of
|
|
|
|
|
# success, regardless of how old your existing system is.
|
|
|
|
|
#
|
1999-12-08 13:45:11 +00:00
|
|
|
buildworld:
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-10 10:48:20 +00:00
|
|
|
@echo ">>> Rebuilding the temporary build tree"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-10 10:48:20 +00:00
|
|
|
.if !defined(NOCLEAN)
|
1998-08-31 01:08:08 +00:00
|
|
|
rm -rf ${WORLDTMP}
|
1999-12-10 10:48:20 +00:00
|
|
|
.endif
|
1999-12-08 13:45:11 +00:00
|
|
|
.for _dir in ${USRDIRS}
|
|
|
|
|
mkdir -p ${WORLDTMP}/${_dir}
|
|
|
|
|
.endfor
|
|
|
|
|
.for _dir in ${INCDIRS}
|
|
|
|
|
mkdir -p ${WORLDTMP}/usr/include/${_dir}
|
|
|
|
|
.endfor
|
2001-03-22 09:54:25 +00:00
|
|
|
ln -sf ${.CURDIR}/sys ${WORLDTMP}
|
1999-12-10 10:48:20 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 1: bootstrap tools"
|
1999-12-10 10:48:20 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
cd ${.CURDIR}; ${BMAKE} bootstrap-tools
|
1998-08-31 01:08:08 +00:00
|
|
|
.if !defined(NOCLEAN)
|
|
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 2: cleaning up the object tree"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
|
1999-01-04 12:05:59 +00:00
|
|
|
.endif
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 2: rebuilding the object tree"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
cd ${.CURDIR}; ${WMAKE} par-obj
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 2: build tools"
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}; ${TMAKE} build-tools
|
1999-11-24 06:04:11 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 3: cross tools"
|
1999-11-24 06:04:11 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
cd ${.CURDIR}; ${XMAKE} cross-tools
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 4: populating ${WORLDTMP}/usr/include"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
2001-06-11 18:09:08 +00:00
|
|
|
cd ${.CURDIR}; ${WMAKE} SHARED=copies includes
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 4: building libraries"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
2000-02-03 09:43:17 +00:00
|
|
|
cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
@echo ">>> stage 4: make dependencies"
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}; ${WMAKE} par-depend
|
|
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
@echo ">>> stage 4: building everything.."
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
cd ${.CURDIR}; ${WMAKE} all
|
1998-08-31 01:08:08 +00:00
|
|
|
|
|
|
|
|
everything:
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1998-09-17 16:32:00 +00:00
|
|
|
@echo ">>> Building everything.."
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-20 10:32:11 +00:00
|
|
|
cd ${.CURDIR}; ${WMAKE} all
|
1998-08-31 01:08:08 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# installworld
|
|
|
|
|
#
|
|
|
|
|
# Installs everything compiled by a 'buildworld'.
|
|
|
|
|
#
|
|
|
|
|
installworld:
|
2000-07-19 04:41:59 +00:00
|
|
|
mkdir -p ${INSTALLTMP}
|
2000-11-20 02:17:34 +00:00
|
|
|
for prog in [ awk cat chflags chmod chown date echo egrep find grep \
|
2001-08-29 09:11:03 +00:00
|
|
|
ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
test true uname wc zic; do \
|
2000-07-19 04:41:59 +00:00
|
|
|
cp `which $$prog` ${INSTALLTMP}; \
|
|
|
|
|
done
|
1999-12-10 10:48:20 +00:00
|
|
|
cd ${.CURDIR}; ${IMAKE} reinstall
|
2000-07-19 04:41:59 +00:00
|
|
|
rm -rf ${INSTALLTMP}
|
1998-08-31 01:08:08 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# reinstall
|
|
|
|
|
#
|
|
|
|
|
# If you have a build server, you can NFS mount the source and obj directories
|
|
|
|
|
# and do a 'make reinstall' on the *client* to install new binaries from the
|
|
|
|
|
# most recent server build.
|
|
|
|
|
#
|
|
|
|
|
reinstall:
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1998-09-17 16:32:00 +00:00
|
|
|
@echo ">>> Making hierarchy"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy
|
|
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1998-09-17 16:32:00 +00:00
|
|
|
@echo ">>> Installing everything.."
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
|
1999-04-11 21:48:09 +00:00
|
|
|
.if !defined(NOMAN)
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-04-11 21:48:09 +00:00
|
|
|
@echo ">>> Rebuilding man page indices"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}/share/man; ${MAKE} makedb
|
1999-04-11 21:48:09 +00:00
|
|
|
.endif
|
1998-08-31 01:08:08 +00:00
|
|
|
|
2000-11-21 04:37:30 +00:00
|
|
|
#
|
|
|
|
|
# distribworld
|
|
|
|
|
#
|
|
|
|
|
# Front-end to distribute to make sure the search path contains
|
|
|
|
|
# the object directory. Needed for miniperl.
|
|
|
|
|
#
|
|
|
|
|
distribworld:
|
|
|
|
|
cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute
|
|
|
|
|
|
2000-01-09 17:56:40 +00:00
|
|
|
#
|
|
|
|
|
# buildkernel and installkernel
|
|
|
|
|
#
|
|
|
|
|
# Which kernels to build and/or install is specified by setting
|
2001-01-22 07:29:48 +00:00
|
|
|
# KERNCONF. If not defined a GENERIC kernel is built/installed.
|
2000-01-09 17:56:40 +00:00
|
|
|
# Only the existing (depending MACHINE) config files are used
|
|
|
|
|
# for building kernels and only the first of these is designated
|
|
|
|
|
# as the one being installed.
|
|
|
|
|
#
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
# Note that we have to use MACHINE instead of TARGET_ARCH when
|
|
|
|
|
# we're in kernel-land. Since only TARGET_ARCH is (expected) to
|
2000-01-09 17:56:40 +00:00
|
|
|
# be set to cross-build, we have to make sure MACHINE is set
|
|
|
|
|
# properly.
|
|
|
|
|
|
2001-01-23 09:52:50 +00:00
|
|
|
.if !defined(KERNCONF) && defined(KERNEL)
|
|
|
|
|
KERNCONF= ${KERNEL}
|
|
|
|
|
KERNWARN= yes
|
|
|
|
|
.else
|
2001-01-22 07:29:48 +00:00
|
|
|
KERNCONF?= GENERIC
|
2001-01-23 09:52:50 +00:00
|
|
|
.endif
|
2000-09-03 02:58:39 +00:00
|
|
|
INSTKERNNAME?= kernel
|
2000-01-09 17:56:40 +00:00
|
|
|
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
# The only exotic TARGET_ARCH/MACHINE combination valid at this
|
2000-01-09 17:56:40 +00:00
|
|
|
# time is i386/pc98. In all other cases set MACHINE equal to
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
# TARGET_ARCH.
|
|
|
|
|
.if ${TARGET_ARCH} != "i386" || ${MACHINE} != "pc98"
|
|
|
|
|
MACHINE= ${TARGET_ARCH}
|
2000-01-09 17:56:40 +00:00
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
KRNLSRCDIR= ${.CURDIR}/sys
|
|
|
|
|
KRNLCONFDIR= ${KRNLSRCDIR}/${MACHINE}/conf
|
|
|
|
|
KRNLOBJDIR= ${OBJTREE}${KRNLSRCDIR}
|
2001-08-27 12:01:46 +00:00
|
|
|
KERNCONFDIR?= ${KRNLCONFDIR}
|
2000-01-09 17:56:40 +00:00
|
|
|
|
|
|
|
|
BUILDKERNELS=
|
|
|
|
|
INSTALLKERNEL=
|
2001-01-22 07:29:48 +00:00
|
|
|
.for _kernel in ${KERNCONF}
|
2001-08-27 12:01:46 +00:00
|
|
|
.if exists(${KERNCONFDIR}/${_kernel})
|
2000-01-09 17:56:40 +00:00
|
|
|
BUILDKERNELS+= ${_kernel}
|
|
|
|
|
.if empty(INSTALLKERNEL)
|
|
|
|
|
INSTALLKERNEL= ${_kernel}
|
|
|
|
|
.endif
|
|
|
|
|
.endif
|
|
|
|
|
.endfor
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# buildkernel
|
|
|
|
|
#
|
|
|
|
|
# Builds all kernels defined by BUILDKERNELS.
|
|
|
|
|
#
|
|
|
|
|
buildkernel:
|
2000-10-25 04:31:32 +00:00
|
|
|
.if empty(BUILDKERNELS)
|
2001-01-22 07:29:48 +00:00
|
|
|
@echo ">>> ERROR: Missing kernel configuration file(s) (${KERNCONF})."
|
2000-10-25 04:31:32 +00:00
|
|
|
@false
|
2001-01-23 09:52:50 +00:00
|
|
|
.endif
|
|
|
|
|
.if defined(KERNWARN)
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
@echo ">>> WARNING: KERNEL= setting should be changed to KERNCONF="
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
@sleep 3
|
2000-10-25 04:31:32 +00:00
|
|
|
.endif
|
2000-01-09 17:56:40 +00:00
|
|
|
@echo
|
2001-01-21 23:44:41 +00:00
|
|
|
.for _kernel in ${BUILDKERNELS}
|
2000-01-09 17:56:40 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
2001-03-02 16:52:14 +00:00
|
|
|
@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
|
2000-01-09 17:56:40 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
@echo "===> ${_kernel}"
|
2000-04-27 09:20:18 +00:00
|
|
|
mkdir -p ${KRNLOBJDIR}
|
2000-06-15 10:00:20 +00:00
|
|
|
.if !defined(NO_KERNELCONFIG)
|
2000-01-09 17:56:40 +00:00
|
|
|
cd ${KRNLCONFDIR}; \
|
|
|
|
|
PATH=${TMPPATH} \
|
2001-08-27 12:01:46 +00:00
|
|
|
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
|
|
|
|
|
${KERNCONFDIR}/${_kernel}
|
2001-01-22 23:10:01 +00:00
|
|
|
.endif
|
2001-01-22 23:29:13 +00:00
|
|
|
.if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN)
|
2001-01-22 23:10:01 +00:00
|
|
|
cd ${KRNLOBJDIR}/${_kernel}; \
|
|
|
|
|
${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} clean
|
2000-06-15 10:00:20 +00:00
|
|
|
.endif
|
2000-01-09 17:56:40 +00:00
|
|
|
cd ${KRNLOBJDIR}/${_kernel}; \
|
2000-09-18 03:35:49 +00:00
|
|
|
MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \
|
|
|
|
|
${MAKE} -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
|
2000-06-15 10:00:20 +00:00
|
|
|
.if !defined(NO_KERNELDEPEND)
|
|
|
|
|
cd ${KRNLOBJDIR}/${_kernel}; \
|
2001-01-22 08:07:58 +00:00
|
|
|
${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} depend
|
2000-06-15 10:00:20 +00:00
|
|
|
.endif
|
|
|
|
|
cd ${KRNLOBJDIR}/${_kernel}; \
|
2001-01-22 08:07:58 +00:00
|
|
|
${KMAKEENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} all
|
2001-01-21 23:44:41 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
2001-03-02 16:52:14 +00:00
|
|
|
@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
|
2001-01-21 23:44:41 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
2000-01-09 17:56:40 +00:00
|
|
|
.endfor
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# installkernel
|
|
|
|
|
#
|
|
|
|
|
# Install the kernel defined by INSTALLKERNEL
|
|
|
|
|
#
|
|
|
|
|
installkernel:
|
|
|
|
|
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
|
2000-09-03 02:58:39 +00:00
|
|
|
${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} install
|
2000-09-17 21:02:58 +00:00
|
|
|
reinstallkernel:
|
|
|
|
|
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
|
|
|
|
|
${CROSSENV} MACHINE=${MACHINE} ${MAKE} KERNEL=${INSTKERNNAME} reinstall
|
2000-09-03 02:58:39 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# kernel
|
|
|
|
|
#
|
|
|
|
|
# Short hand for `make buildkernel installkernel'
|
|
|
|
|
#
|
|
|
|
|
kernel: buildkernel installkernel
|
2000-01-09 17:56:40 +00:00
|
|
|
|
1998-08-31 01:08:08 +00:00
|
|
|
#
|
|
|
|
|
# update
|
|
|
|
|
#
|
|
|
|
|
# Update the source tree, by running sup and/or running cvs to update to the
|
|
|
|
|
# latest copy.
|
|
|
|
|
#
|
|
|
|
|
update:
|
|
|
|
|
.if defined(SUP_UPDATE)
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1998-09-17 16:32:00 +00:00
|
|
|
@echo ">>> Running ${SUP}"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
1999-12-16 01:21:48 +00:00
|
|
|
.if defined(SUPFILE)
|
1998-08-31 01:08:08 +00:00
|
|
|
@${SUP} ${SUPFLAGS} ${SUPFILE}
|
1999-12-16 01:21:48 +00:00
|
|
|
.endif
|
1998-08-31 01:08:08 +00:00
|
|
|
.if defined(SUPFILE1)
|
|
|
|
|
@${SUP} ${SUPFLAGS} ${SUPFILE1}
|
|
|
|
|
.endif
|
|
|
|
|
.if defined(SUPFILE2)
|
|
|
|
|
@${SUP} ${SUPFLAGS} ${SUPFILE2}
|
|
|
|
|
.endif
|
2000-08-07 14:35:49 +00:00
|
|
|
.if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE)
|
1999-06-01 02:55:44 +00:00
|
|
|
@${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
|
|
|
|
|
.endif
|
2000-08-07 14:35:49 +00:00
|
|
|
.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
|
|
|
|
|
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
|
|
|
|
|
.endif
|
1998-08-31 01:08:08 +00:00
|
|
|
.endif
|
|
|
|
|
.if defined(CVS_UPDATE)
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1999-06-04 17:34:28 +00:00
|
|
|
@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
2000-03-29 07:30:44 +00:00
|
|
|
cd ${.CURDIR}; cvs -q update -A -P -d
|
1998-08-31 01:08:08 +00:00
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# most
|
|
|
|
|
#
|
|
|
|
|
# Build most of the user binaries on the existing system libs and includes.
|
|
|
|
|
#
|
|
|
|
|
most:
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1998-09-17 16:32:00 +00:00
|
|
|
@echo ">>> Building programs only"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}/bin; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/sbin; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/libexec; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/usr.bin; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/usr.sbin; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/gnu/libexec; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/gnu/usr.bin; ${MAKE} all
|
|
|
|
|
cd ${.CURDIR}/gnu/usr.sbin; ${MAKE} all
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# installmost
|
|
|
|
|
#
|
|
|
|
|
# Install the binaries built by the 'most' target. This does not include
|
|
|
|
|
# libraries or include files.
|
|
|
|
|
#
|
|
|
|
|
installmost:
|
|
|
|
|
@echo "--------------------------------------------------------------"
|
1998-09-17 16:32:00 +00:00
|
|
|
@echo ">>> Installing programs only"
|
1998-08-31 01:08:08 +00:00
|
|
|
@echo "--------------------------------------------------------------"
|
|
|
|
|
cd ${.CURDIR}/bin; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/sbin; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/libexec; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/usr.bin; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/usr.sbin; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/gnu/libexec; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/gnu/usr.bin; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/gnu/usr.sbin; ${MAKE} install
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
#
|
|
|
|
|
# From here onwards are utility targets used by the 'make world' and
|
|
|
|
|
# related targets. If your 'world' breaks, you may like to try to fix
|
|
|
|
|
# the problem and manually run the following targets to attempt to
|
|
|
|
|
# complete the build. Beware, this is *not* guaranteed to work, you
|
|
|
|
|
# need to have a pretty good grip on the current state of the system
|
|
|
|
|
# to attempt to manually finish it. If in doubt, 'make world' again.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
#
|
1999-12-20 10:32:11 +00:00
|
|
|
# bootstrap-tools: Build tools needed for compatibility
|
1998-08-31 01:08:08 +00:00
|
|
|
#
|
1999-12-10 16:13:41 +00:00
|
|
|
.if exists(${.CURDIR}/games) && !defined(NOGAMES)
|
1999-12-23 19:18:28 +00:00
|
|
|
_strfile= games/fortune/strfile
|
1999-12-10 16:13:41 +00:00
|
|
|
.endif
|
|
|
|
|
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
bootstrap-tools:
|
2001-05-28 16:54:02 +00:00
|
|
|
.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.bin/xinstall \
|
|
|
|
|
usr.sbin/config usr.sbin/kbdcontrol \
|
2001-04-18 12:20:28 +00:00
|
|
|
gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo
|
1999-12-08 13:45:11 +00:00
|
|
|
cd ${.CURDIR}/${_tool}; \
|
1999-12-10 10:48:20 +00:00
|
|
|
${MAKE} obj; \
|
1999-12-08 13:45:11 +00:00
|
|
|
${MAKE} depend; \
|
|
|
|
|
${MAKE} all; \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
${MAKE} DESTDIR=${MAKEOBJDIRPREFIX} install
|
1999-12-08 13:45:11 +00:00
|
|
|
.endfor
|
1999-11-24 06:04:11 +00:00
|
|
|
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
#
|
1999-12-20 10:32:11 +00:00
|
|
|
# build-tools: Build special purpose build tools
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
#
|
|
|
|
|
.if exists(${.CURDIR}/games) && !defined(NOGAMES)
|
|
|
|
|
_games= games/adventure games/hack games/phantasia
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
.if exists(${.CURDIR}/share) && !defined(NOSHARE)
|
|
|
|
|
_share= share/syscons/scrnmaps
|
|
|
|
|
.endif
|
|
|
|
|
|
2000-01-29 08:39:07 +00:00
|
|
|
.if !defined(NO_FORTRAN)
|
|
|
|
|
_fortran= gnu/usr.bin/cc/f771
|
|
|
|
|
.endif
|
|
|
|
|
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
.if !defined(NOPERL)
|
|
|
|
|
_perl= gnu/usr.bin/perl/miniperl
|
|
|
|
|
.endif
|
|
|
|
|
|
1999-12-30 10:31:21 +00:00
|
|
|
.if exists(${.CURDIR}/kerberosIV) && exists(${.CURDIR}/crypto) && \
|
|
|
|
|
!defined(NOCRYPT) && defined(MAKE_KERBEROS4)
|
2000-01-24 20:11:53 +00:00
|
|
|
_libroken4= kerberosIV/lib/libroken
|
|
|
|
|
.endif
|
|
|
|
|
|
|
|
|
|
.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
|
|
|
|
|
!defined(NOCRYPT) && defined(MAKE_KERBEROS5)
|
2001-02-14 19:48:51 +00:00
|
|
|
_libkrb5= kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
|
1999-12-30 10:31:21 +00:00
|
|
|
.endif
|
|
|
|
|
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
build-tools:
|
2000-12-03 20:29:31 +00:00
|
|
|
.for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
${_perl} ${_libroken4} ${_libkrb5} lib/libncurses ${_share} usr.bin/file \
|
2001-08-17 17:21:38 +00:00
|
|
|
usr.sbin/sysinstall
|
o Add games/caesar to the list of bootstrap-tools so that a
buildworld doesn't break because the host doesn't have any
games installed,
o Add a new build stage: TMAKE. TMAKE builds all the build-tools
targets in the respective makefiles. Note that these targets
don't use the bootstrap tools,
o Add elf2exe to the bootstrap-tools when cross-building Alpha on
other platforms,
o Add ${WORLDTMP}/usr/games to TMPPATH,
o Remove ${WORLDTMP}/usr/bin even when NOCLEAN is defined. This
prevents using any bootstrap-tools previously installed. Most
importantly, it prevents using the cross-compiler when we still
need the native compiler.
The current stages are BMAKE, TMAKE, XMAKE and IMAKE in that order.
BMAKE builds bootstrap-tools that either solve compatibility problems
or are needed as cross-tools,
TMAKE builds the support tools necessary by some parts in the source
tree and also performs the cleandir and par-obj targets,
XMAKE builds the includes, libraries and everything (resp.), and
IMAKE installs the world. This stage needs further work if it's to be
used to install -current over -stable for example.
This is the last major update towards cross-building.
1999-12-16 13:47:34 +00:00
|
|
|
cd ${.CURDIR}/${_tool}; ${MAKE} build-tools
|
|
|
|
|
.endfor
|
|
|
|
|
|
1999-12-20 10:32:11 +00:00
|
|
|
#
|
|
|
|
|
# cross-tools: Build cross-building tools
|
|
|
|
|
#
|
|
|
|
|
.if ${TARGET_ARCH} == "alpha" && ${MACHINE_ARCH} != "alpha"
|
|
|
|
|
_elf2exe= usr.sbin/elf2exe
|
|
|
|
|
.endif
|
|
|
|
|
|
2000-01-04 14:12:12 +00:00
|
|
|
.if ${TARGET_ARCH} == "i386" && ${MACHINE_ARCH} != "i386"
|
|
|
|
|
_btxld= usr.sbin/btxld
|
|
|
|
|
.endif
|
|
|
|
|
|
1999-12-20 10:32:11 +00:00
|
|
|
cross-tools:
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
.for _tool in ${_btxld} ${_elf2exe} \
|
2001-06-14 01:35:23 +00:00
|
|
|
gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc
|
1999-12-20 10:32:11 +00:00
|
|
|
cd ${.CURDIR}/${_tool}; \
|
|
|
|
|
${MAKE} obj; \
|
|
|
|
|
${MAKE} depend; \
|
|
|
|
|
${MAKE} all; \
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
${MAKE} DESTDIR=${MAKEOBJDIRPREFIX} install
|
1999-12-20 10:32:11 +00:00
|
|
|
.endfor
|
|
|
|
|
|
1999-11-24 06:04:11 +00:00
|
|
|
#
|
1999-12-08 13:45:11 +00:00
|
|
|
# hierarchy - ensure that all the needed directories are present
|
1999-11-24 06:04:11 +00:00
|
|
|
#
|
1999-12-08 13:45:11 +00:00
|
|
|
hierarchy:
|
|
|
|
|
cd ${.CURDIR}/etc; ${MAKE} distrib-dirs
|
1998-08-31 01:08:08 +00:00
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# includes - possibly generate and install the include files.
|
|
|
|
|
#
|
|
|
|
|
includes:
|
1999-12-20 10:32:11 +00:00
|
|
|
cd ${.CURDIR}/include; ${MAKE} -B all install
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/gnu/include; ${MAKE} install
|
|
|
|
|
cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall
|
2000-01-30 20:57:58 +00:00
|
|
|
cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall
|
1999-04-03 08:18:43 +00:00
|
|
|
cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall
|
2001-03-26 12:46:17 +00:00
|
|
|
.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
|
1999-12-29 14:47:00 +00:00
|
|
|
.if exists(${.CURDIR}/secure/lib/libcrypto)
|
1999-12-29 13:57:31 +00:00
|
|
|
cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall
|
1999-12-29 14:47:00 +00:00
|
|
|
.endif
|
|
|
|
|
.if exists(${.CURDIR}/secure/lib/libssl)
|
1999-12-28 16:22:50 +00:00
|
|
|
cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
.endif
|
1999-12-29 14:47:00 +00:00
|
|
|
.endif
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \
|
|
|
|
|
defined(MAKE_KERBEROS4)
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/kerberosIV/lib/libacl; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberosIV/lib/libkadm; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberosIV/lib/libkafs; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberosIV/lib/libkdb; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberosIV/lib/libkrb; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberosIV/lib/libtelnet; ${MAKE} beforeinstall
|
Fix cross-building, etc:
1. To cross-build, one now needs to set TARGET_ARCH, and not the
MACHINE_ARCH. MACHINE_ARCH should never be changed manually!
2. Initialize DESTDIR= explicitly for bootstrap-tools, build-tools,
and cross-tools stages. This fixes broken header and library
dependencies problem. We build them in the host environment,
and obviously want them to depend on host headers and libraries.
The problem with broken header dependencies for bootstrap-tools
and cross-tools was already partially solved (see BOOTSTRAPPING
tests in bsd.prog.mk and bsd.lib.mk), but it was still there for
build-tools if the user ran "make world DESTDIR=/foo". Also,
for all of these stages, the library dependencies were broken
because of how bsd.libnames.mk define DPADD members.
We still provide a glue to install bootstrap- and cross-tools
under the ${WORLDTMP}.
Removed PATH overrides for bootstrap-, build-, and cross-tools
stages. There is just no reason why we would need to override
it, and the hacks to clean up the ${WORLDTMP} in the -DNOCLEAN
case are no longer needed with fixes from this step.
That is, we now never use ${WORLDTMP} headers and libraries,
and we don't use any ${WORLDTMP} installed binaries during
these stages. Again, these stages depend solely on the host
environment, including compiler, headers, and libraries.
3. Moved "miniperl" back from cross-tools (it has nothing to do
with a cross-compiler) to build-tools where it belongs. The
change from step 1 let to do this. Also, to make this work,
build-tools targets of "cc_tools" and "miniperl" were modified
to call "depend". Here follow the detailed explanations.
There are two categories of build tools, for now. In the first
category there are "cc_tools" and "miniperl". They occupy the
whole (sub)directory, and nothing needs to be done in this
subdirectory later during the "all" stage. They are also
constructed using system makefiles. We must build the .depend
early in the build-tools stage because:
1) They use (and depend on) the host environment.
2) If we don't do this in build-tools, the "depend" stage of
buildworld will do this for us; wrong library and header
dependencies will be recorded (DESTDIR=${WORLDTMP}) and,
what's worse, the "all" stage may then clobber the
build-architecture format tools (that we built in the
build-tools stage) with the target-architecture format
ones, breaking cross build.
In the second category there are all other build-tools. They
share their directory with the "main" module that needs them
in the "all" stage, and they don't show up themselves in the
.depend file. The portion of this fix was already committed
in gnu/usr.bin/cc/cc_tools/Makefile,v 1.52.
4. "libperl" is no longer a build tool, and "miniperl" is the
stand-alone application. I had to make this change because
build-tools and "all" stages share the same object directory.
Without this change, if we cross compile, libperl.a is first
built for the build architecture during the build-tools stage
(for the purposes of immediate linkage with "miniperl").
Later on, the "all" stage sees this library as up-to-date,
and doesn't rebuild it. The effect is that the wrong format
static libperl library is installed with installworld.
5. Fixed "includes" to install secure/lib/libtelnet headers if
required.
Reviewed by: bde
2001-09-29 13:17:54 +00:00
|
|
|
.elif exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
|
|
|
|
|
cd ${.CURDIR}/secure/lib/libtelnet; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
.else
|
|
|
|
|
cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall
|
|
|
|
|
.endif
|
2000-01-24 20:11:53 +00:00
|
|
|
.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \
|
|
|
|
|
defined(MAKE_KERBEROS5)
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall
|
|
|
|
|
.endif
|
1998-08-31 20:48:13 +00:00
|
|
|
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
|
|
|
|
|
cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
.endif
|
2000-10-28 21:26:48 +00:00
|
|
|
cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall
|
1998-09-17 09:35:02 +00:00
|
|
|
cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall
|
1998-09-15 07:46:17 +00:00
|
|
|
cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall
|
1998-09-15 07:46:17 +00:00
|
|
|
cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall
|
2000-09-09 14:37:06 +00:00
|
|
|
cd ${.CURDIR}/lib/libfetch; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libftpio; ${MAKE} beforeinstall
|
1999-10-04 14:57:38 +00:00
|
|
|
cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall
|
2001-07-29 08:58:22 +00:00
|
|
|
cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
.if !defined(WANT_CSRG_LIBM)
|
|
|
|
|
cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall
|
|
|
|
|
.endif
|
1999-11-25 20:05:07 +00:00
|
|
|
cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libopie; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libpcap; ${MAKE} beforeinstall
|
1998-11-13 00:59:00 +00:00
|
|
|
cd ${.CURDIR}/lib/libradius; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/librpcsvc; ${MAKE} beforeinstall
|
2001-08-26 17:45:56 +00:00
|
|
|
cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
cd ${.CURDIR}/lib/libsbuf; ${MAKE} beforeinstall
|
1998-10-05 08:06:45 +00:00
|
|
|
cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall
|
1998-11-13 00:59:00 +00:00
|
|
|
cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall
|
1999-04-02 15:37:07 +00:00
|
|
|
cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall
|
|
|
|
|
cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall
|
|
|
|
|
|
|
|
|
|
#
|
1999-12-08 13:45:11 +00:00
|
|
|
# libraries - build all libraries, and install them under ${DESTDIR}.
|
1999-11-24 06:04:11 +00:00
|
|
|
#
|
1999-12-08 13:45:11 +00:00
|
|
|
# The following dependencies exist between the libraries:
|
|
|
|
|
#
|
2000-11-10 22:02:06 +00:00
|
|
|
# lib*: csu libgcc_pic
|
1999-12-08 13:45:11 +00:00
|
|
|
# libatm: libmd
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
# libcam: libsbuf
|
1999-12-08 13:45:11 +00:00
|
|
|
# libcrypt: libmd
|
2001-08-04 18:25:48 +00:00
|
|
|
# libdevstat: libkvm
|
1999-12-08 13:45:11 +00:00
|
|
|
# libdialog: libncurses
|
|
|
|
|
# libedit: libncurses
|
|
|
|
|
# libg++: libm
|
|
|
|
|
# libkrb: libcrypt
|
|
|
|
|
# libopie: libmd
|
2000-11-10 22:02:06 +00:00
|
|
|
# libpam: libcom_err libcrypt libcrypto libkrb libopie libradius \
|
2001-08-26 17:45:56 +00:00
|
|
|
# librpcsvc libtacplus libutil libz libssh
|
1999-12-08 13:45:11 +00:00
|
|
|
# libradius: libmd
|
|
|
|
|
# libreadline: libncurses
|
|
|
|
|
# libstc++: libm
|
|
|
|
|
# libtacplus: libmd
|
|
|
|
|
#
|
|
|
|
|
# Across directories this comes down to (rougly):
|
|
|
|
|
#
|
|
|
|
|
# gnu/lib: lib/libm lib/libncurses
|
2000-01-24 20:11:53 +00:00
|
|
|
# kerberosIV/lib kerberos5/lib: lib/libcrypt
|
2000-11-10 22:02:06 +00:00
|
|
|
# lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb \
|
2000-02-24 23:03:16 +00:00
|
|
|
# secure/lib/libssh lib/libz
|
1999-12-08 13:45:11 +00:00
|
|
|
# secure/lib: lib/libmd
|
1998-08-31 01:08:08 +00:00
|
|
|
#
|
1999-04-20 05:33:07 +00:00
|
|
|
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc)
|
1999-12-08 13:45:11 +00:00
|
|
|
_csu= lib/csu/${MACHINE_ARCH}.pcc
|
1998-08-31 20:48:13 +00:00
|
|
|
.elif ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf"
|
1999-12-08 13:45:11 +00:00
|
|
|
_csu= lib/csu/i386-elf
|
1998-08-31 01:08:08 +00:00
|
|
|
.else
|
1999-12-08 13:45:11 +00:00
|
|
|
_csu= lib/csu/${MACHINE_ARCH}
|
1998-08-31 01:08:08 +00:00
|
|
|
.endif
|
|
|
|
|
|
1999-01-23 08:44:17 +00:00
|
|
|
.if !defined(NOSECURE) && !defined(NOCRYPT)
|
|
|
|
|
_secure_lib= secure/lib
|
|
|
|
|
.endif
|
1998-08-31 01:08:08 +00:00
|
|
|
|
1998-11-20 02:03:52 +00:00
|
|
|
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
|
1999-12-08 13:45:11 +00:00
|
|
|
_kerberosIV_lib= kerberosIV/lib
|
1998-11-20 02:03:52 +00:00
|
|
|
.endif
|
|
|
|
|
|
2000-01-24 20:11:53 +00:00
|
|
|
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5)
|
|
|
|
|
_kerberos5_lib= kerberos5/lib
|
|
|
|
|
.endif
|
|
|
|
|
|
1998-08-31 01:08:08 +00:00
|
|
|
.if defined(WANT_CSRG_LIBM)
|
|
|
|
|
_libm= lib/libm
|
|
|
|
|
.else
|
|
|
|
|
_libm= lib/msun
|
|
|
|
|
.endif
|
|
|
|
|
|
1999-12-17 11:23:56 +00:00
|
|
|
.if ${MACHINE_ARCH} == "i386"
|
|
|
|
|
_libkeycap= usr.sbin/pcvt/keycap
|
|
|
|
|
.endif
|
|
|
|
|
|
2000-11-20 02:17:34 +00:00
|
|
|
.if !defined(NOPERL)
|
|
|
|
|
_libperl= gnu/usr.bin/perl/libperl
|
|
|
|
|
.endif
|
|
|
|
|
|
1999-11-24 06:04:11 +00:00
|
|
|
libraries:
|
2000-11-10 22:02:06 +00:00
|
|
|
.for _lib in ${_csu} gnu/lib/csu gnu/lib/libgcc lib/libmd lib/libcrypt \
|
|
|
|
|
${_secure_lib} ${_kerberosIV_lib} \
|
2001-08-04 18:25:48 +00:00
|
|
|
${_kerberos5_lib} lib/libcom_err lib/libkvm ${_libm} lib/libncurses \
|
2001-08-26 17:45:56 +00:00
|
|
|
lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \
|
Rewrite of the CAM error recovery code.
Some of the major changes include:
- The SCSI error handling portion of cam_periph_error() has
been broken out into a number of subfunctions to better
modularize the code that handles the hierarchy of SCSI errors.
As a result, the code is now much easier to read.
- String handling and error printing has been significantly
revamped. We now use sbufs to do string formatting instead
of using printfs (for the kernel) and snprintf/strncat (for
userland) as before.
There is a new catchall error printing routine,
cam_error_print() and its string-based counterpart,
cam_error_string() that allow the kernel and userland
applications to pass in a CCB and have errors printed out
properly, whether or not they're SCSI errors. Among other
things, this helped eliminate a fair amount of duplicate code
in camcontrol.
We now print out more information than before, including
the CAM status and SCSI status and the error recovery action
taken to remedy the problem.
- sbufs are now available in userland, via libsbuf. This
change was necessary since most of the error printing code
is shared between libcam and the kernel.
- A new transfer settings interface is included in this checkin.
This code is #ifdef'ed out, and is primarily intended to aid
discussion with HBA driver authors on the final form the
interface should take. There is example code in the ahc(4)
driver that implements the HBA driver side of the new
interface. The new transfer settings code won't be enabled
until we're ready to switch all HBA drivers over to the new
interface.
src/Makefile.inc1,
lib/Makefile: Add libsbuf. It must be built before libcam,
since libcam uses sbuf routines.
libcam/Makefile: libcam now depends on libsbuf.
libsbuf/Makefile: Add a makefile for libsbuf. This pulls in the
sbuf sources from sys/kern.
bsd.libnames.mk: Add LIBSBUF.
camcontrol/Makefile: Add -lsbuf. Since camcontrol is statically
linked, we can't depend on the dynamic linker
to pull in libsbuf.
camcontrol.c: Use cam_error_print() instead of checking for
CAM_SCSI_STATUS_ERROR on every failed CCB.
sbuf.9: Change the prototypes for sbuf_cat() and
sbuf_cpy() so that the source string is now a
const char *. This is more in line wth the
standard system string functions, and helps
eliminate warnings when dealing with a const
source buffer.
Fix a typo.
cam.c: Add description strings for the various CAM
error status values, as well as routines to
look up those strings.
Add new cam_error_string() and
cam_error_print() routines for userland and
the kernel.
cam.h: Add a new CAM flag, CAM_RETRY_SELTO.
Add enumerated types for the various options
available with cam_error_print() and
cam_error_string().
cam_ccb.h: Add new transfer negotiation structures/types.
Change inq_len in the ccb_getdev structure to
be "reserved". This field has never been
filled in, and will be removed when we next
bump the CAM version.
cam_debug.h: Fix typo.
cam_periph.c: Modularize cam_periph_error(). The SCSI error
handling part of cam_periph_error() is now
in camperiphscsistatuserror() and
camperiphscsisenseerror().
In cam_periph_lock(), increase the reference
count on the periph while we wait for our lock
attempt to succeed so that the periph won't go
away while we're sleeping.
cam_xpt.c: Add new transfer negotiation code. (ifdefed
out)
Add a new function, xpt_path_string(). This
is a string/sbuf analog to xpt_print_path().
scsi_all.c: Revamp string handing and error printing code.
We now use sbufs for much of the string
formatting code. More of that code is shared
between userland the kernel.
scsi_all.h: Get rid of SS_TURSTART, it wasn't terribly
useful in the first place.
Add a new error action, SS_REQSENSE. (Send a
request sense and then retry the command.)
This is useful when the controller hasn't
performed autosense for some reason.
Change the default actions around a bit.
scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c: SF_RETRY_SELTO -> CAM_RETRY_SELTO. Selection
timeouts shouldn't be covered by a sense flag.
scsi_pass.[ch]: SF_RETRY_SELTO -> CAM_RETRY_SELTO.
Get rid of the last vestiges of a read/write
interface.
libkern/bsearch.c,
sys/libkern.h,
conf/files: Add bsearch.c, which is needed for some of the
new table lookup routines.
aic7xxx_freebsd.c: Define AHC_NEW_TRAN_SETTINGS if
CAM_NEW_TRAN_CODE is defined.
sbuf.h,
subr_sbuf.c: Add the appropriate #ifdefs so sbufs can
compile and run in userland.
Change sbuf_printf() to use vsnprintf()
instead of kvprintf(), which is only available
in the kernel.
Change the source string for sbuf_cpy() and
sbuf_cat() to be a const char *.
Add __BEGIN_DECLS and __END_DECLS around
function prototypes since they're now exported
to userland.
kdump/mkioctls: Include stdio.h before cam.h since cam.h now
includes a function with a FILE * argument.
Submitted by: gibbs (mostly)
Reviewed by: jdp, marcel (libsbuf makefile changes)
Reviewed by: des (sbuf changes)
Reviewed by: ken
2001-03-27 05:45:52 +00:00
|
|
|
lib/libutil lib/libz lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap}
|
1999-11-24 06:04:11 +00:00
|
|
|
.if exists(${.CURDIR}/${_lib})
|
1999-12-08 13:45:11 +00:00
|
|
|
cd ${.CURDIR}/${_lib}; \
|
|
|
|
|
${MAKE} depend; \
|
|
|
|
|
${MAKE} all; \
|
|
|
|
|
${MAKE} install
|
1999-01-07 06:26:33 +00:00
|
|
|
.endif
|
1999-07-07 04:46:46 +00:00
|
|
|
.endfor
|
1998-09-01 00:39:02 +00:00
|
|
|
|
1998-08-31 01:08:08 +00:00
|
|
|
.for __target in clean cleandepend cleandir depend obj
|
|
|
|
|
.for entry in ${SUBDIR}
|
|
|
|
|
${entry}.${__target}__D: .PHONY
|
1998-08-31 20:48:13 +00:00
|
|
|
@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
|
|
|
|
|
${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH}"; \
|
|
|
|
|
edir=${entry}.${MACHINE_ARCH}; \
|
1998-08-31 01:08:08 +00:00
|
|
|
cd ${.CURDIR}/$${edir}; \
|
|
|
|
|
else \
|
|
|
|
|
${ECHODIR} "===> ${DIRPRFX}${entry}"; \
|
|
|
|
|
edir=${entry}; \
|
|
|
|
|
cd ${.CURDIR}/$${edir}; \
|
|
|
|
|
fi; \
|
|
|
|
|
${MAKE} ${__target} DIRPRFX=${DIRPRFX}$${edir}/
|
|
|
|
|
.endfor
|
|
|
|
|
par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
|
|
|
|
|
.endfor
|
|
|
|
|
|
|
|
|
|
.include <bsd.subdir.mk>
|
