[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.542.2.9 and 1.542.2.9.4.8

version 1.542.2.9, 2009/03/18 05:39:06 version 1.542.2.9.4.8, 2013/12/18 18:38:21
Line 1 
Line 1 
 #       $NetBSD$  #       bsd.own.mk,v 1.542.2.9.4.6 2011/04/29 07:48:36 matt Exp
   
   # This needs to be before bsd.init.mk
   .if defined(BSD_MK_COMPAT_FILE)
   .include <${BSD_MK_COMPAT_FILE}>
   .endif
   
 .if !defined(_BSD_OWN_MK_)  .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1  _BSD_OWN_MK_=1
Line 9  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/}  MACHINE_CPU=    ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:C/arm.*/arm/}
   
 #  #
 # Subdirectory used below ${RELEASEDIR} when building a release  # Subdirectory used below ${RELEASEDIR} when building a release
Line 257  TOOL_MKESDB=  ${TOOLDIR}/bin/${_TOOL_PRE
Line 262  TOOL_MKESDB=  ${TOOLDIR}/bin/${_TOOL_PRE
 TOOL_MKLOCALE=          ${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale  TOOL_MKLOCALE=          ${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
 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_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_PAX=               ${TOOLDIR}/bin/${_TOOL_PREFIX}pax  TOOL_PAX=               ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
Line 325  TOOL_MKESDB=  mkesdb
Line 331  TOOL_MKESDB=  mkesdb
 TOOL_MKLOCALE=          mklocale  TOOL_MKLOCALE=          mklocale
 TOOL_MKMAGIC=           file  TOOL_MKMAGIC=           file
 TOOL_MKTEMP=            mktemp  TOOL_MKTEMP=            mktemp
   TOOL_MKUBOOTIMAGE=      mkubootimage
 TOOL_MSGC=              msgc  TOOL_MSGC=              msgc
 TOOL_MTREE=             mtree  TOOL_MTREE=             mtree
 TOOL_PAX=               pax  TOOL_PAX=               pax
Line 516  MKGDB=  no
Line 523  MKGDB=  no
 # not just shared libraries, so don't build the _pic version.  # not just shared libraries, so don't build the _pic version.
 #  #
 .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"  .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
   # .${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
 MKPICLIB:=      no  MKPICLIB:=      no
 .endif  .endif
   
 #  #
 # On VAX using ELF, all objects are PIC, not just shared libraries,  # On VAX using ELF, all objects are PIC, not just shared libraries,
 # so don't build the _pic version.  Unless we are using GCC3 which  # so don't build the _pic version.
 # doesn't support PIC yet.  
 #  #
 .if ${MACHINE_ARCH} == "vax"  .if ${MACHINE_ARCH} == "vax"
 MKPICLIB=       no  MKPICLIB=       no
Line 550  MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
Line 557  MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_AR
 # an "elf" tag for historically a.out platforms.  # an "elf" tag for historically a.out platforms.
 #  #
 .if ${OBJECT_FMT} == "ELF" && \  .if ${OBJECT_FMT} == "ELF" && \
     (${MACHINE_GNU_ARCH} == "arm" || \      (${MACHINE_CPU} == "arm" || \
      ${MACHINE_GNU_ARCH} == "armeb" || \  
      ${MACHINE_ARCH} == "i386" || \       ${MACHINE_ARCH} == "i386" || \
      ${MACHINE_CPU} == "m68k" || \       ${MACHINE_CPU} == "m68k" || \
      ${MACHINE_GNU_ARCH} == "sh" || \       ${MACHINE_GNU_ARCH} == "sh" || \
Line 630  MK${var}:= yes
Line 636  MK${var}:= yes
 #  #
 # MK* options which have variable defaults.  # MK* options which have variable defaults.
 #  #
 .if ${MACHINE} == "amd64" || ${MACHINE} == "sparc64"  .if ${MACHINE} == "amd64" || ${MACHINE} == "sparc64" || \
       ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 MKCOMPAT?=      yes  MKCOMPAT?=      yes
 .else  .else
 # Don't let this build where it really isn't supported.  # Don't let this build where it really isn't supported.
Line 638  MKCOMPAT:= no
Line 645  MKCOMPAT:= no
 .endif  .endif
   
 #  #
   # Default mips64 to softfloat now.
   #
   .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
   MKSOFTFLOAT?=   yes
   .endif
   
   #
 # MK* options which default to "yes".  # MK* options which default to "yes".
 #  #
 .for var in \  .for var in \
         MKATF \          MKATF \
         MKBFD MKBINUTILS \          MKBFD MKBINUTILS \
         MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \          MKCATPAGES MKCOMPLEX MKCRYPTO MKCVS MKCXX \
         MKDOC \          MKDOC \
         MKGCC MKGCCCMDS MKGDB \          MKGCC MKGCCCMDS MKGDB MKGROFF \
         MKHESIOD MKHTML \          MKHESIOD MKHTML \
         MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \          MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
         MKKERBEROS \          MKKERBEROS \
Line 687  X11FLAVOUR?= XFree86
Line 701  X11FLAVOUR?= XFree86
 # Force some options off if their dependencies are off.  # Force some options off if their dependencies are off.
 #  #
   
   .if ${MKCXX} == "no"
   MKATF:=         no
   MKGROFF:=       no
   .endif
   
 .if ${MKCRYPTO} == "no"  .if ${MKCRYPTO} == "no"
 MKKERBEROS:=    no  MKKERBEROS:=    no
 .endif  .endif
Line 823  X11SRCDIRMIT?=  ${X11SRCDIR}/external/mi
Line 842  X11SRCDIRMIT?=  ${X11SRCDIR}/external/mi
         FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \          FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
         Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \          Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \
         Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \          Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
         fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil          fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil \
           pciaccess
 X11SRCDIR.${_lib}?=             ${X11SRCDIRMIT}/lib${_lib}/dist  X11SRCDIR.${_lib}?=             ${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor  .endfor
   
 .for _proto in \  .for _proto in \
         xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \          xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
         xinerama print render resource record video xf86dga xf86misc \          xinerama print render resource record video xf86dga xf86misc \
         xf86vidmode composite damage trap gl randr fontcache xf86dri          xf86vidmode composite damage trap gl randr fontcache xf86dri \
           dri2
 X11SRCDIR.${_proto}proto?=              ${X11SRCDIRMIT}/${_proto}proto/dist  X11SRCDIR.${_proto}proto?=              ${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor  .endfor
   
Line 868  X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
Line 889  X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
 .endfor  .endfor
   
 .for _v in \  .for _v in \
         agten apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \          ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \
         intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \          intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \
         rendition s3 s3virge savage siliconmotion sis sunffb suncg6 tdfx tga \          rendition s3 s3virge savage siliconmotion sis sunffb suncg6 sunleo \
         trident tseng vesa vga via vmware wsfb          suntcx tdfx tga trident tseng vesa vga via vmware wsfb
   
 X11SRCDIR.xf86-video-${_v}?=    ${X11SRCDIRMIT}/xf86-video-${_v}/dist  X11SRCDIR.xf86-video-${_v}?=    ${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor  .endfor
Line 886  X11LOADABLE?=   yes
Line 907  X11LOADABLE?=   yes
   
 #  #
 # MAKEDIRTARGET dir target [extra make(1) params]  # MAKEDIRTARGET dir target [extra make(1) params]
 #       run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message  #       run "cd $${dir} && ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}", with a pretty message
 #  #
   MAKEDIRTARGETENV?=
 MAKEDIRTARGET=\  MAKEDIRTARGET=\
         @_makedirtarget() { \          @_makedirtarget() { \
                 dir="$$1"; shift; \                  dir="$$1"; shift; \
Line 903  MAKEDIRTARGET=\
Line 925  MAKEDIRTARGET=\
                 show=$${this:-.}; \                  show=$${this:-.}; \
                 echo "$${target} ===> $${show%/}$${1:+  (with: $$@)}"; \                  echo "$${target} ===> $${show%/}$${1:+  (with: $$@)}"; \
                 cd "$${real}" \                  cd "$${real}" \
                 && ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \                  && ${MAKEDIRTARGETENV} ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
         }; \          }; \
         _makedirtarget          _makedirtarget
   

Legend:
Removed from v.1.542.2.9  
changed lines
  Added in v.1.542.2.9.4.8

CVSweb <webmaster@jp.NetBSD.org>