[BACK]Return to bsd.own.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.own.mk between version 1.691 and 1.691.2.4

version 1.691, 2011/11/02 00:10:08 version 1.691.2.4, 2013/01/23 00:05:36
Line 14  MAKECONF?= /etc/mk.conf
Line 14  MAKECONF?= /etc/mk.conf
 #  #
 # CPU model, derived from MACHINE_ARCH  # CPU model, derived from MACHINE_ARCH
 #  #
 MACHINE_CPU=    ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/:S/powerpc64/powerpc/}  MACHINE_CPU=    ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/:S/earm/arm/:S/earmeb/arm/:S/powerpc64/powerpc/}
   
 #  #
 # Subdirectory used below ${RELEASEDIR} when building a release  # Subdirectory used below ${RELEASEDIR} when building a release
Line 49  TOOLCHAIN_MISSING?= no
Line 49  TOOLCHAIN_MISSING?= no
 #  #
 # Platforms still using GCC 4.1  # Platforms still using GCC 4.1
 #  #
   .if ${MKGCC:Uyes} != "no"
 .if ${MACHINE_CPU}  == "vax"  .if ${MACHINE_CPU}  == "vax"
 HAVE_GCC?=    4  HAVE_GCC?=    4
 .else  .else
 # Otherwise, default to GCC4.5  # Otherwise, default to GCC4.5
 HAVE_GCC?=    45  HAVE_GCC?=    45
 .endif  .endif
   .endif
   
 .if \  .if \
       ${MACHINE_CPU} == "arm" || \
     ${MACHINE_ARCH} == "i386" || \      ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "powerpc" || \      ${MACHINE_ARCH} == "powerpc" || \
       ${MACHINE_CPU} == "sh3" || \
     ${MACHINE_ARCH} == "x86_64"      ${MACHINE_ARCH} == "x86_64"
 USE_COMPILERCRTSTUFF?=  no  USE_COMPILERCRTSTUFF?=  no
 .endif  .endif
 USE_COMPILERCRTSTUFF?=  yes  USE_COMPILERCRTSTUFF?=  yes
   
   
 #  
 # Platforms still using GDB 6  
 #  
 .if ${MACHINE_ARCH} == "alpha"  || \  
     ${MACHINE_ARCH} == "hppa"   || \  
     ${MACHINE_CPU}  == "mips"   || \  
     ${MACHINE_ARCH} == "vax"  
 HAVE_GDB?= 6  
 .else  
 # Otherwise, default to GDB7  
 HAVE_GDB?=      7  HAVE_GDB?=      7
 .endif  
   
   
 .if empty(.MAKEFLAGS:M-V*)  .if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)  .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=    ${MAKE} -r -V .OBJDIR -f /dev/null xxx  PRINTOBJDIR=    ${MAKE} -r -V .OBJDIR -f /dev/null xxx
 .else  .else
 PRINTOBJDIR=    ${MAKE} -V .OBJDIR  PRINTOBJDIR=    ${MAKE} -V .OBJDIR
 .endif  .endif
 .else  .else
 PRINTOBJDIR=    echo # prevent infinite recursion  PRINTOBJDIR=    echo /error/bsd.own.mk/PRINTOBJDIR # avoid infinite recursion
 .endif  .endif
   
 #  #
Line 106  _SRC_TOP_!= cd "${.CURDIR}"; while :; do
Line 97  _SRC_TOP_!= cd "${.CURDIR}"; while :; do
 .endif                                  # }  .endif                                  # }
   
 #  #
 # If _SRC_TOP_ != "", we're within the NetBSD source tree, so set  # If _SRC_TOP_ != "", we're within the NetBSD source tree.
 # defaults for NETBSDSRCDIR and _SRC_TOP_OBJ_.  # * Set defaults for NETBSDSRCDIR and _SRC_TOP_OBJ_.
   # * Define _NETBSD_VERSION_DEPENDS.  Targets that depend on the
   #   NetBSD version, or on variables defined at build time, can
   #   declare a dependency on ${_NETBSD_VERSION_DEPENDS}.
 #  #
 .if (${_SRC_TOP_} != "")                # {  .if (${_SRC_TOP_} != "")                # {
   
Line 118  _SRC_TOP_OBJ_!=  cd "${_SRC_TOP_}" && ${
Line 112  _SRC_TOP_OBJ_!=  cd "${_SRC_TOP_}" && ${
 .MAKEOVERRIDES+=        _SRC_TOP_OBJ_  .MAKEOVERRIDES+=        _SRC_TOP_OBJ_
 .endif  .endif
   
   _NETBSD_VERSION_DEPENDS=        ${_SRC_TOP_OBJ_}/params
   _NETBSD_VERSION_DEPENDS+=       ${NETBSDSRCDIR}/sys/sys/param.h
   _NETBSD_VERSION_DEPENDS+=       ${NETBSDSRCDIR}/sys/conf/newvers.sh
   _NETBSD_VERSION_DEPENDS+=       ${NETBSDSRCDIR}/sys/conf/osrelease.sh
   ${_SRC_TOP_OBJ_}/params: .NOTMAIN .OPTIONAL # created by top level "make build"
   
 .endif  # _SRC_TOP_ != ""               # }  .endif  # _SRC_TOP_ != ""               # }
   
   
Line 192  TOOL_CPP.gcc=  ${EXTERNAL_TOOLCHAIN}/bin
Line 192  TOOL_CPP.gcc=  ${EXTERNAL_TOOLCHAIN}/bin
 TOOL_CXX.gcc=           ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-c++  TOOL_CXX.gcc=           ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-c++
 TOOL_FC.gcc=            ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-g77  TOOL_FC.gcc=            ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-g77
 TOOL_OBJC.gcc=          ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc  TOOL_OBJC.gcc=          ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc
   
   TOOL_CC.clang=          ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang
   TOOL_CPP.clang=         ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang-cpp
   TOOL_CXX.clang=         ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang++
   TOOL_OBJC.clang=        ${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-clang
 .else                                                                   # } {  .else                                                                   # } {
 # Define default locations for common tools.  # Define default locations for common tools.
 .if ${USETOOLS_BINUTILS:Uyes} == "yes"                                  #  {  .if ${USETOOLS_BINUTILS:Uyes} == "yes"                                  #  {
Line 306  TOOL_MKLOCALE=  ${TOOLDIR}/bin/${_TOOL_P
Line 311  TOOL_MKLOCALE=  ${TOOLDIR}/bin/${_TOOL_P
 TOOL_MKMAGIC=           ${TOOLDIR}/bin/${_TOOL_PREFIX}file  TOOL_MKMAGIC=           ${TOOLDIR}/bin/${_TOOL_PREFIX}file
 TOOL_MKTEMP=            ${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp  TOOL_MKTEMP=            ${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
 TOOL_MKUBOOTIMAGE=      ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage  TOOL_MKUBOOTIMAGE=      ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
   TOOL_ELFTOSB=           ${TOOLDIR}/bin/${_TOOL_PREFIX}elftosb
 TOOL_MSGC=              MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc  TOOL_MSGC=              MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
 TOOL_MTREE=             ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree  TOOL_MTREE=             ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
 TOOL_NBPERF=            ${TOOLDIR}/bin/${_TOOL_PREFIX}perf  TOOL_NBPERF=            ${TOOLDIR}/bin/${_TOOL_PREFIX}perf
Line 393  TOOL_MAKEFS=  makefs
Line 399  TOOL_MAKEFS=  makefs
 TOOL_MAKEINFO=          makeinfo  TOOL_MAKEINFO=          makeinfo
 TOOL_MAKEWHATIS=        /usr/libexec/makewhatis  TOOL_MAKEWHATIS=        /usr/libexec/makewhatis
 TOOL_MANDOC_ASCII=      mandoc -Tascii  TOOL_MANDOC_ASCII=      mandoc -Tascii
 TOOL_MANDOC_HTML=       mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css  TOOL_MANDOC_HTML=       mandoc -Thtml
 TOOL_MANDOC_LINT=       mandoc -Tlint  TOOL_MANDOC_LINT=       mandoc -Tlint
 TOOL_MDSETIMAGE=        mdsetimage  TOOL_MDSETIMAGE=        mdsetimage
 TOOL_MENUC=             menuc  TOOL_MENUC=             menuc
Line 405  TOOL_MKLOCALE=  mklocale
Line 411  TOOL_MKLOCALE=  mklocale
 TOOL_MKMAGIC=           file  TOOL_MKMAGIC=           file
 TOOL_MKTEMP=            mktemp  TOOL_MKTEMP=            mktemp
 TOOL_MKUBOOTIMAGE=      mkubootimage  TOOL_MKUBOOTIMAGE=      mkubootimage
   TOOL_ELFTOSB=           elftosb
 TOOL_MSGC=              msgc  TOOL_MSGC=              msgc
 TOOL_MTREE=             mtree  TOOL_MTREE=             mtree
 TOOL_NBPERF=            nbperf  TOOL_NBPERF=            nbperf
Line 455  CXX=  ${TOOL_CXX.${ACTIVE_CXX}}
Line 462  CXX=  ${TOOL_CXX.${ACTIVE_CXX}}
 FC=             ${TOOL_FC.${ACTIVE_FC}}  FC=             ${TOOL_FC.${ACTIVE_FC}}
 OBJC=           ${TOOL_OBJC.${ACTIVE_OBJC}}  OBJC=           ${TOOL_OBJC.${ACTIVE_OBJC}}
   
   .if exists(/usr/bin/${TOOL_CTFCONVERT}) || exists(${TOOL_CTFCONVERT})
   CTFCONVERT=     ${TOOL_CTFCONVERT}
   CTFMERGE=       ${TOOL_CTFMERGE}
   .endif
   
 # OBJCOPY flags to create a.out binaries for old firmware  # OBJCOPY flags to create a.out binaries for old firmware
 # shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc  # shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
 .if ${MACHINE_CPU} == "arm"  .if ${MACHINE_CPU} == "arm"
Line 462  OBJCOPY_ELF2AOUT_FLAGS?= \
Line 474  OBJCOPY_ELF2AOUT_FLAGS?= \
         -O a.out-arm-netbsd     \          -O a.out-arm-netbsd     \
         -R .ident               \          -R .ident               \
         -R .ARM.attributes      \          -R .ARM.attributes      \
           -R .ARM.exidx           \
         -R .arm.atpcs           \          -R .arm.atpcs           \
         -R .comment             \          -R .comment             \
         -R .debug_abbrev        \          -R .debug_abbrev        \
Line 534  MANDIR?= /usr/share/man
Line 547  MANDIR?= /usr/share/man
 MANGRP?=        wheel  MANGRP?=        wheel
 MANOWN?=        root  MANOWN?=        root
 MANMODE?=       ${NONBINMODE}  MANMODE?=       ${NONBINMODE}
 MANINSTALL?=    catinstall htmlinstall maninstall  MANINSTALL?=    ${_MANINSTALL}
   
 INFODIR?=       /usr/share/info  INFODIR?=       /usr/share/info
 INFOGRP?=       wheel  INFOGRP?=       wheel
Line 656  SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve
Line 669  SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_ve
 # GNU sources and packages sometimes see architecture names differently.  # GNU sources and packages sometimes see architecture names differently.
 #  #
 GNU_ARCH.coldfire=m68k  GNU_ARCH.coldfire=m68k
   GNU_ARCH.earm=arm
   GNU_ARCH.earmeb=armeb
 GNU_ARCH.i386=i486  GNU_ARCH.i386=i486
 GCC_CONFIG_ARCH.i386=i486  GCC_CONFIG_ARCH.i386=i486
 GCC_CONFIG_TUNE.i386=nocona  GCC_CONFIG_TUNE.i386=nocona
Line 670  MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
Line 685  MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
 # In order to identify NetBSD to GNU packages, we sometimes need  # In order to identify NetBSD to GNU packages, we sometimes need
 # an "elf" tag for historically a.out platforms.  # an "elf" tag for historically a.out platforms.
 #  #
 .if (${MACHINE_GNU_ARCH} == "arm" || \  .if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
   MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf-eabi
   .elif (${MACHINE_GNU_ARCH} == "arm" || \
      ${MACHINE_GNU_ARCH} == "armeb" || \       ${MACHINE_GNU_ARCH} == "armeb" || \
      ${MACHINE_ARCH} == "i386" || \       ${MACHINE_ARCH} == "i386" || \
      ${MACHINE_CPU} == "m68k" || \       ${MACHINE_CPU} == "m68k" || \
Line 776  MKCOMPATMODULES:= no
Line 793  MKCOMPATMODULES:= no
   
 #  #
 # Default mips64 to softfloat now.  # Default mips64 to softfloat now.
   # arm is always softfloat
 # emips is always softfloat.  # emips is always softfloat.
 #  #
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \  .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \
     ${MACHINE} == "emips"      ${MACHINE_CPU} == "arm" || ${MACHINE} == "emips"
 MKSOFTFLOAT?=   yes  MKSOFTFLOAT?=   yes
 .endif  .endif
   
Line 787  MKSOFTFLOAT?= yes
Line 805  MKSOFTFLOAT?= yes
 SOFTFLOAT_BITS= 32  SOFTFLOAT_BITS= 32
 .endif  .endif
   
   .if ${MACHINE_ARCH} == "i386" || \
       ${MACHINE_ARCH} == "x86_64" || \
       ${MACHINE_ARCH} == "sparc"
   MKSLJIT?=       yes
   .else
   MKSLJIT?=       no
   .endif
   
 #  #
 # MK* backward compatibility.  # MK* backward compatibility.
 #  #
Line 807  MKZFS?=  yes
Line 833  MKZFS?=  yes
 _MKVARS.yes= \  _MKVARS.yes= \
         MKATF \          MKATF \
         MKBINUTILS \          MKBINUTILS \
         MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS MKCXX \          MKCRYPTO MKCOMPLEX MKCVS MKCXX \
         MKDOC \          MKDOC \
         MKGCC MKGCCCMDS MKGDB MKGROFF \          MKGCC MKGCCCMDS MKGDB MKGROFF \
         MKHESIOD MKHTML \          MKHESIOD MKHTML \
Line 815  _MKVARS.yes= \
Line 841  _MKVARS.yes= \
         MKKERBEROS \          MKKERBEROS \
         MKKMOD \          MKKMOD \
         MKLDAP MKLINKLIB MKLINT MKLVM \          MKLDAP MKLINKLIB MKLINT MKLVM \
         MKMAN \          MKMAN MKMANDOC \
         MKMDNS \          MKMDNS \
           MKMAKEMANDB \
         MKNLS \          MKNLS \
         MKNPF \          MKNPF \
         MKOBJ \          MKOBJ \
         MKPAM MKPERFUSE \          MKPAM MKPERFUSE \
         MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \          MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
           MKRUMP \
         MKSHARE MKSKEY MKSTATICLIB \          MKSHARE MKSKEY MKSTATICLIB \
         MKX11FONTS \          MKX11FONTS \
         MKYP          MKYP
Line 841  ${var}?= yes
Line 869  ${var}?= yes
 # default for some platforms, see above.  # default for some platforms, see above.
 #  #
 _MKVARS.no= \  _MKVARS.no= \
         MKBSDGREP MKBSDTAR MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG \          MKBSDGREP MKBSDTAR \
           MKCATPAGES MKCRYPTO_RC5 MKDEBUG \
         MKDEBUGLIB MKDTRACE MKEXTSRC \          MKDEBUGLIB MKDTRACE MKEXTSRC \
         MKMANDOC MKMANZ MKOBJDIRS \          MKMANZ MKOBJDIRS \
         MKLLVM MKPCC \          MKLLVM MKPCC \
         MKPIGZGZIP \          MKPIGZGZIP \
         MKREPRO \          MKREPRO \
         MKSOFTFLOAT MKSTRIPIDENT \          MKSOFTFLOAT MKSTRIPIDENT MKTPM \
         MKUNPRIVED MKUPDATE MKX11 MKZFS          MKUNPRIVED MKUPDATE MKX11 MKZFS
 .for var in ${_MKVARS.no}  .for var in ${_MKVARS.no}
 ${var}?=no  ${var}?=no
Line 890  MKCATPAGES:= no
Line 919  MKCATPAGES:= no
 MKHTML:=        no  MKHTML:=        no
 .endif  .endif
   
   _MANINSTALL=    maninstall
   .if ${MKCATPAGES} != "no"
   _MANINSTALL+=   catinstall
   .endif
   .if ${MKHTML} != "no"
   _MANINSTALL+=   htmlinstall
   .endif
   
 .if ${MKLINKLIB} == "no"  .if ${MKLINKLIB} == "no"
 MKLINT:=        no  MKLINT:=        no
 MKPICINSTALL:=  no  MKPICINSTALL:=  no
Line 1084  X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
Line 1121  X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
         r128 radeonhd rendition \          r128 radeonhd rendition \
         s3 s3virge savage siliconmotion sis suncg14 \          s3 s3virge savage siliconmotion sis suncg14 \
         suncg6 sunffb sunleo suntcx \          suncg6 sunffb sunleo suntcx \
         tdfx tga trident tseng vesa vga via vmware wsfb          tdfx tga trident tseng vesa vga via vmware wsfb xgi
 X11SRCDIR.xf86-video-${_v}?=    ${X11SRCDIRMIT}/xf86-video-${_v}/dist  X11SRCDIR.xf86-video-${_v}?=    ${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor  .endfor
   

Legend:
Removed from v.1.691  
changed lines
  Added in v.1.691.2.4

CVSweb <webmaster@jp.NetBSD.org>