DragonFly BSD

CVS log for src/share/mk/sys.mk

[BACK] Up to [DragonFly] / src / share / mk

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.21: download - view: text, markup, annotated - select for diffs
Mon May 19 10:26:02 2008 UTC (6 years, 2 months ago) by corecode
Branches: MAIN
CVS tags: HEAD, DragonFly_RELEASE_2_0_Slip, DragonFly_RELEASE_2_0, DragonFly_Preview
Diff to: previous 1.20: preferred, unified
Changes since revision 1.20: +4 -0 lines
Add macros for the linker, which might be different than the compiler.

Revision 1.20: download - view: text, markup, annotated - select for diffs
Sun Jul 22 21:59:36 2007 UTC (7 years ago) by corecode
Branches: MAIN
CVS tags: DragonFly_RELEASE_1_12_Slip, DragonFly_RELEASE_1_12, DragonFly_RELEASE_1_10_Slip, DragonFly_RELEASE_1_10
Diff to: previous 1.19: preferred, unified
Changes since revision 1.19: +1 -1 lines
Pkgsrc defaults to modular Xorg and /usr/pkg nowadays.

Revision 1.19: download - view: text, markup, annotated - select for diffs
Fri Jan 19 07:23:41 2007 UTC (7 years, 6 months ago) by dillon
Branches: MAIN
CVS tags: DragonFly_RELEASE_1_8_Slip, DragonFly_RELEASE_1_8
Diff to: previous 1.18: preferred, unified
Changes since revision 1.18: +13 -13 lines
Rename /usr/src/sys/machine to /usr/src/sys/platform.  Give the platform
name its own variable, MACHINE_PLATFORM, instead of trying to use MACHINE
to name it.  Adjust the build infrastructure to match.

Revert MACHINE back to its original definition and remove uname shims.
This removes confusion with third party software.

This means a pc32 build has MACHINE=i386 and MACHINE_ARCH=i386, and a
vkernel build also has MACHINE=i386 and MACHINE_ARCH=i386.  The new
MACHINE_PLAFORM would be pc32 for a pc32 build, and vkernel for a vkernel
build.

Adjust all kernel configuration files to specify platform, machine, AND
machine_arch.

Revision 1.18: download - view: text, markup, annotated - select for diffs
Wed Nov 15 03:27:10 2006 UTC (7 years, 8 months ago) by corecode
Branches: MAIN
Diff to: previous 1.17: preferred, unified
Changes since revision 1.17: +7 -0 lines
Don't break buildworld for upgrading users:  "i386" is no valid platorm
name anymore, so we automatically convert it to "pc32".
Remove checks for build/installworld, as sys.mk deals with fixing now.

Discussed-with: pavalos
DragonFly-issue: http://bugs.dragonflybsd.org/issue379 (among others)

Revision 1.17: download - view: text, markup, annotated - select for diffs
Wed Nov 8 20:43:31 2006 UTC (7 years, 8 months ago) by dillon
Branches: MAIN
Diff to: previous 1.16: preferred, unified
Changes since revision 1.16: +5 -3 lines
bmake uses /usr/share/mk/sys.mk, so we cannot require that MACHINE_CPU be
defined by the make program.

Revision 1.16: download - view: text, markup, annotated - select for diffs
Tue Nov 7 06:57:02 2006 UTC (7 years, 8 months ago) by dillon
Branches: MAIN
Diff to: previous 1.15: preferred, unified
Changes since revision 1.15: +15 -6 lines
Major kernel build infrastructure changes, part 2/2 (user).

These changes are primarily designed to create a 2-layer machine and cpu
build hierarchy in order to support virtual kernel builds in the near term
and future porting efforts in the long term.

* The make program now pulls MACHINE, MACHINE_ARCH, and MACHINE_CPU from
  the kernel hw.machine, hw.machine_arch, and hw.machine_cpu sysctl
  variables, unless overridden by environment variables.

* The config program now generates additional softlinks in the kernel build
  directory:

  machine	points to the platform architecture header files
  machine_base	points to the baes of the platform architecture directory.
  cpu		points to the cpu architecture header files
  cpu_base	points to the base of the cpu architecture directory

  Additionally, the config program generates forwarding header files as
  includes/machine/*.h.  Any cpu architecture header files that are not
  overridden by the platform architecture are generated in this directory.

  The kernel build's Makefile adjusts the -I paths to effectively merge
  machine/ and includes/machine/, presenting a uniform <machine/*.h>
  include file architecture to the kernel build.

  The kernel build's Makefile now automatically exports MACHINE and
  MACHINE_ARCH as environment variables.

  The kernel build's Makefile now makes opt_*, use_*, and IF header files
  directly available to the module build subsystem so the module build
  subsystem does not have to generate them in each module subdirectory.

* Kernel configuration files now require both a 'machine' and a 'machine_arch'
  directive.  Typically:

  machine	pc32		(subject to change)
  machine_arch	i386

* /usr/include/cpu has been added to augment /usr/include/machine.  The
  buildworld infrastructure also automatically merges any <cpu/*.h> header
  files that were not overridden by the <machine/*.h> header files into
  /usr/include/machine.

  Note that direct access to /usr/include/cpu is not recommended.

* A number of weird cases that generate extranious 'machine' softlinks
  (for <machine/*.h> header access) have been removed.

* The MACHINE_ARCH default to i386 has been removed.  If the make program
  does not define the MACHINE_ environment and sys.mk is included, sys.mk
  will now fail with an error.

* cpdup has been added to the bootstrap tools.

Revision 1.14.2.1: download - view: text, markup, annotated - select for diffs
Thu Jan 26 17:48:36 2006 UTC (8 years, 6 months ago) by corecode
Branches: DragonFly_RELEASE_1_4
CVS tags: DragonFly_RELEASE_1_4_Slip
Diff to: previous 1.14: preferred, unified; next MAIN 1.15: preferred, unified
Changes since revision 1.14: +1 -1 lines
Adjust X11BASE so that ssh/sshd find xauth with pkgsrc.

Revision 1.15: download - view: text, markup, annotated - select for diffs
Thu Jan 26 17:48:35 2006 UTC (8 years, 6 months ago) by corecode
Branches: MAIN
CVS tags: DragonFly_RELEASE_1_6_Slip, DragonFly_RELEASE_1_6
Diff to: previous 1.14: preferred, unified
Changes since revision 1.14: +1 -1 lines
Adjust X11BASE so that ssh/sshd find xauth with pkgsrc.

Revision 1.14: download - view: text, markup, annotated - select for diffs
Thu Jul 7 11:49:56 2005 UTC (9 years ago) by corecode
Branches: MAIN
Branch point for: DragonFly_RELEASE_1_4
Diff to: previous 1.13: preferred, unified
Changes since revision 1.13: +1 -0 lines
convert ln to ${LN}

Revision 1.13: download - view: text, markup, annotated - select for diffs
Sun Jun 5 19:23:10 2005 UTC (9 years, 1 month ago) by corecode
Branches: MAIN
Diff to: previous 1.12: preferred, unified
Changes since revision 1.12: +3 -0 lines
Add infrastructure to build (static) libs for the host system

Revision 1.12: download - view: text, markup, annotated - select for diffs
Mon Jul 19 16:24:27 2004 UTC (10 years ago) by dillon
Branches: MAIN
CVS tags: DragonFly_Stable, DragonFly_Snap29Sep2004, DragonFly_Snap13Sep2004, DragonFly_RELEASE_1_2_Slip, DragonFly_RELEASE_1_2
Diff to: previous 1.11: preferred, unified
Changes since revision 1.11: +1 -1 lines
Correct a bug in NXCCFLAGS generation.

Revision 1.11: download - view: text, markup, annotated - select for diffs
Mon Jun 21 03:48:07 2004 UTC (10 years, 1 month ago) by dillon
Branches: MAIN
CVS tags: DragonFly_1_0_REL, DragonFly_1_0_RC1, DragonFly_1_0A_REL
Diff to: previous 1.10: preferred, unified
Changes since revision 1.10: +4 -4 lines
Hook gcc 3.4 into the buildworld.  Rearrange HOST_CCVER so it becomes the
responsibility of the Makefile element that is overriding CCVER.  Get rid
of the obsolete MY_CCVER magic.  Fix improper use of ${.TARGET} in
cc34/cc_tools/Makefile.tools.  Do not try to override _CPUCFLAGS in
bsd.hostprog.mk, which doesn't handle the generic .nx/.no case.  Instead
remove -mtune, -mcpu, and -march options in NXCFLAGS and NXCXXFLAGS.

Work-by: Joerg Sonnenberger <joerg@crater.dragonflybsd.org>
Reviewed-by: Matthew Dillon <dillon@backplane.com>

Revision 1.10: download - view: text, markup, annotated - select for diffs
Sun Jun 20 20:41:07 2004 UTC (10 years, 1 month ago) by joerg
Branches: MAIN
Diff to: previous 1.9: preferred, unified
Changes since revision 1.9: +1 -1 lines
Don't include _CPUCFLAGS since the host compiler (aka NXCC) might not
understand them. Add HOST_CCVER which replaces CCVER for NXCC and NXCXX.
This defaults to CCVER, but can be overriden via environment e.g. from
Makefile.inc1.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Tue Jun 15 11:56:03 2004 UTC (10 years, 1 month ago) by joerg
Branches: MAIN
Diff to: previous 1.8: preferred, unified
Changes since revision 1.8: +2 -0 lines
Really use the host compiler in bsd.hostprog.mk

Revision 1.8: download - view: text, markup, annotated - select for diffs
Sat Apr 3 23:07:14 2004 UTC (10 years, 3 months ago) by dillon
Branches: MAIN
Diff to: previous 1.7: preferred, unified
Changes since revision 1.7: +2 -1 lines
Cleanup NXENV so it works properly when running buildworld from FreeBSD.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Fri Mar 26 21:57:23 2004 UTC (10 years, 4 months ago) by dillon
Branches: MAIN
Diff to: previous 1.6: preferred, unified
Changes since revision 1.6: +1 -1 lines
The NXCC (native C compiler) misnamed OBJFORMATPATH, it neesd to be
OBJFORMAT_PATH, causing 'missing crt1.o' from ld in the buildworld
includes stage.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Mon Mar 22 20:58:15 2004 UTC (10 years, 4 months ago) by dillon
Branches: MAIN
Diff to: previous 1.5: preferred, unified
Changes since revision 1.5: +27 -1 lines
This represents a major update to the buildworld subsystem.

    Compartmentalize the bootstrap/buildtools, the cross-build setup,
    and the world stage.  /usr/obj/usr/src is now far more readable
    (e.g. /usr/obj/usr/src/{btools_i386,ctools_i386_i386,world_i386}).

    Use a completely private command path for the world stage of the build.
    The bootstrap/buildtools stage compiles all required system programs
    (like rm, ln, chmod, etc).   At the moment the build compiles everything
    it needs, but this can be augmented later to 'cp' the required binaries
    into btools_<arch> instead of building them, including potentially copying
    the compiler binaries so the ctools_<arch> build could use a private
    path too).

    The 'buildworld' target now properly removes all object modules for
    all major stages.  Several new targets have been added to reduce
    build times, the most useful of which is 'quickworld', which skips
    the btools and ctools stages (they must have already been built).

    sys.mk has been augmented to support .nx binaries and .no object
    modules, which are built using ${NXCC} and friends, which always uses
    the system's native compiler rather then potentially using the
    cross-build compiler, for generating helper programs during the build.
    This way we do not have to special-case building the helper programs in
    an earlier stage as FreeBSD does.

    Fix a bug in 'wmake', which simulates the buildworld environment for
    piecemeal compilation/testing.  It was not using /usr/src/share/mk.

    Add additional .ORDER: constraints to better support make -j N
    (incomplete).  Note that recent changes to the DragonFly scheduler make
    it more likely for buildworld to trip over parallel make races.

    TOOLS_PREFIX was used to generate cross-compiler directory targets
    for exec'd utility binaries and access to libraries and include
    files.  However, in the new compartmentalized breakdown the cross
    compiler's utility binaries will reside in ctools_* while the
    include files and libraries are expected to be installed and accessed
    in world_*.  Add a USRDATA_PREFIX which defaults to TOOLS_PREFIX to
    allow the cross compilation stage to separate the two entities.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Sat Mar 20 16:27:41 2004 UTC (10 years, 4 months ago) by drhodus
Branches: MAIN
Diff to: previous 1.4: preferred, unified
Changes since revision 1.4: +1 -9 lines
Start removing the old build infrastructure for the a.out
binaries. MOst of the interface had already been depreciated
for a while now and we only had remnants remaining.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Wed Jan 28 19:24:09 2004 UTC (10 years, 6 months ago) by dillon
Branches: MAIN
Diff to: previous 1.3: preferred, unified
Changes since revision 1.3: +1 -2 lines
Undo some of the previously made changes to deal with cross build issues
from 4.x and older versions of DFly.

sys.mk should *NOT* include bsd.init.mk.  That is way, way too early and
blows up .inc files, e.g. such as those used by sys/boot.

Rename .sub back to .inc in sys/boot (more on the way) so it will cross build
from 4.x.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Mon Jan 26 16:13:49 2004 UTC (10 years, 6 months ago) by joerg
Branches: MAIN
Diff to: previous 1.2: preferred, unified
Changes since revision 1.2: +2 -1 lines
Always include bsd.init.mk to fix CPUTYPE evaluation

Revision 1.2: download - view: text, markup, annotated - select for diffs
Tue Jun 17 04:37:02 2003 UTC (11 years, 1 month ago) by dillon
Branches: MAIN
Diff to: previous 1.1: preferred, unified
Changes since revision 1.1: +1 -0 lines
Add the DragonFly cvs id and perform general cleanups on cvs/rcs/sccs ids.  Most
ids have been removed from !lint sections and moved into comment sections.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Tue Jun 17 02:53:21 2003 UTC (11 years, 1 month ago) by dillon
Branches: MAIN
CVS tags: FREEBSD_4_FORK
import from FreeBSD RELENG_4 1.45.2.6

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options