[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.1046 and 1.1046.2.7

version 1.1046, 2018/03/05 21:14:34 version 1.1046.2.7, 2018/05/21 04:35:57
Line 67  MKGCC?=  no
Line 67  MKGCC?=  no
 .if \  .if \
     ${MACHINE_CPU} == "aarch64"      ${MACHINE_CPU} == "aarch64"
 HAVE_GCC?=      0  HAVE_GCC?=      0
 .elif \  
     ${MACHINE_CPU} == "m68000" || \  
     ${MACHINE_CPU} == "m68k" || \  
     ${MACHINE_CPU} == "vax"  
 HAVE_GCC?=      5  
 .else  .else
 HAVE_GCC?=      6  HAVE_GCC?=      6
 .endif  .endif
Line 100  MKGCCCMDS?= no
Line 95  MKGCCCMDS?= no
 #  #
 # What OpenSSL is used?  # What OpenSSL is used?
 #  #
 .if ${MACHINE} != "vax"  
 HAVE_OPENSSL?=  11  HAVE_OPENSSL?=  11
 .else  
 HAVE_OPENSSL?=  10  
 .endif  
   
 .if ${HAVE_OPENSSL} == 11  .if ${HAVE_OPENSSL} == 11
 EXTERNAL_OPENSSL_SUBDIR=openssl  EXTERNAL_OPENSSL_SUBDIR=openssl
Line 173  EXTERNAL_GDB_SUBDIR=  /does/not/exist
Line 164  EXTERNAL_GDB_SUBDIR=  /does/not/exist
 #  #
 HAVE_BINUTILS?= 227  HAVE_BINUTILS?= 227
   
 .if ${HAVE_BINUTILS} == 227  .if ${HAVE_BINUTILS} == 230
 EXTERNAL_BINUTILS_SUBDIR=       binutils  EXTERNAL_BINUTILS_SUBDIR=       binutils
   .elif ${HAVE_BINUTILS} == 227
   EXTERNAL_BINUTILS_SUBDIR=       binutils.old
 .else  .else
 EXTERNAL_BINUTILS_SUBDIR=       /does/not/exist  EXTERNAL_BINUTILS_SUBDIR=       /does/not/exist
 .endif  .endif
Line 329  TOOL_OBJC.clang= ${TOOLDIR}/bin/${MACHIN
Line 322  TOOL_OBJC.clang= ${TOOLDIR}/bin/${MACHIN
 TOOL_CC.pcc=            ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-pcc  TOOL_CC.pcc=            ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-pcc
 TOOL_CPP.pcc=           ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-pcpp  TOOL_CPP.pcc=           ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-pcpp
 TOOL_CXX.pcc=           ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-p++  TOOL_CXX.pcc=           ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-p++
   .endif  # EXTERNAL_TOOLCHAIN                                            # }
   
 #  #
 # Make sure DESTDIR is set, so that builds with these tools always  # Make sure DESTDIR is set, so that builds with these tools always
Line 353  CPPFLAGS+= --sysroot=/
Line 347  CPPFLAGS+= --sysroot=/
 LDFLAGS+=       --sysroot=/  LDFLAGS+=       --sysroot=/
 .  endif  .  endif
 .endif  .endif
 .endif  # EXTERNAL_TOOLCHAIN                                            # }  
   
 DBSYM=          ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym  DBSYM=          ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
 ELF2AOUT=       ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout  ELF2AOUT=       ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
Line 590  TOOL_CXX.false=  false
Line 583  TOOL_CXX.false=  false
 TOOL_FC.false=          false  TOOL_FC.false=          false
 TOOL_OBJC.false=        false  TOOL_OBJC.false=        false
   
 AVAILABLE_COMPILER?=    ${HAVE_PCC:Dpcc} ${HAVE_LLVM:Dclang} ${HAVE_GCC:Dgcc} ${EXTERNAL_TOOLCHAIN:Dgcc} false  AVAILABLE_COMPILER?=    ${HAVE_PCC:Dpcc} ${HAVE_LLVM:Dclang} ${HAVE_GCC:Dgcc} false
   
 .for _t in CC CPP CXX FC OBJC  .for _t in CC CPP CXX FC OBJC
 ACTIVE_${_t}=   ${AVAILABLE_COMPILER:@.c.@ ${ !defined(UNSUPPORTED_COMPILER.${.c.}) && defined(TOOL_${_t}.${.c.}) :? ${.c.} : }@:[1]}  ACTIVE_${_t}=   ${AVAILABLE_COMPILER:@.c.@ ${ !defined(UNSUPPORTED_COMPILER.${.c.}) && defined(TOOL_${_t}.${.c.}) :? ${.c.} : }@:[1]}
Line 604  FC=  ${TOOL_FC.${ACTIVE_FC}}
Line 597  FC=  ${TOOL_FC.${ACTIVE_FC}}
 OBJC=           ${TOOL_OBJC.${ACTIVE_OBJC}}  OBJC=           ${TOOL_OBJC.${ACTIVE_OBJC}}
   
 # For each ${MACHINE_CPU}, list the ports that use it.  # For each ${MACHINE_CPU}, list the ports that use it.
 MACHINES.aarch64=       evbarm64  MACHINES.aarch64=       evbarm
 MACHINES.alpha=         alpha  MACHINES.alpha=         alpha
 MACHINES.arm=           acorn32 cats epoc32 evbarm hpcarm \  MACHINES.arm=           acorn32 cats epoc32 evbarm hpcarm \
                         iyonix netwinder shark zaurus                          iyonix netwinder shark zaurus
Line 615  MACHINES.hppa=  hppa
Line 608  MACHINES.hppa=  hppa
 MACHINES.m68000=        sun2  MACHINES.m68000=        sun2
 MACHINES.m68k=          amiga atari cesfic hp300 luna68k mac68k \  MACHINES.m68k=          amiga atari cesfic hp300 luna68k mac68k \
                         news68k next68k sun3 x68k                          news68k next68k sun3 x68k
 MACHINES.mips=          arc cobalt algor cobalt emips evbmips ews4800mips \  MACHINES.mips=          algor arc cobalt emips evbmips ews4800mips \
                         hpcmips mipsco newsmips pmax sbmips sgimips                          hpcmips mipsco newsmips pmax sbmips sgimips
 MACHINES.or1k=          or1k  MACHINES.or1k=          or1k
 MACHINES.powerpc=       amigappc bebox evbppc ibmnws macppc mvmeppc \  MACHINES.powerpc=       amigappc bebox evbppc ibmnws macppc mvmeppc \
Line 1205  MKXORG_SERVER=yes
Line 1198  MKXORG_SERVER=yes
 MKRADEONFIRMWARE=               yes  MKRADEONFIRMWARE=               yes
 .endif  .endif
   
 # Only install the tegra firmware on evbarm and evbarm64.  # Only install the tegra firmware on evbarm.
 .if ${MACHINE} == "evbarm" || ${MACHINE} == "evbarm64"  .if ${MACHINE} == "evbarm"
 MKTEGRAFIRMWARE=                yes  MKTEGRAFIRMWARE=                yes
 .endif  .endif
   
Line 1343  ${var}?= yes
Line 1336  ${var}?= yes
 # USE_* options which default to "no".  # USE_* options which default to "no".
 #  #
 # For now, disable pigz as compressor by default  # For now, disable pigz as compressor by default
 .for var in USE_PIGZGZIP USE_LIBTRE  .for var in USE_PIGZGZIP
 ${var}?= no  ${var}?= no
 .endfor  .endfor
   
Line 1389  X11SRCDIRMIT?=  ${X11SRCDIR}/external/mi
Line 1382  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 Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \          Xdmcp Xevie Xext Xfixes Xfont Xfont2 Xft Xi Xinerama Xmu Xpresent Xpm \
         Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \          Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
         epoxy fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb xshmfence \          epoxy fontenc xkbfile xkbui Xaw pciaccess xcb xshmfence \
         pthread-stubs          pthread-stubs
 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 \          xcb- xorg
         xinerama dri2 dri3 render resource record video xf86dga xf86misc \  
         xf86vidmode composite damage trap gl randr fontcache xf86dri \  
         present xcb-  
 X11SRCDIR.${_proto}proto?=              ${X11SRCDIRMIT}/${_proto}proto/dist  X11SRCDIR.${_proto}proto?=              ${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor  .endfor
   
Line 1601  TARGETS+= lintmanpages
Line 1591  TARGETS+= lintmanpages
 TESTSBASE=      /usr/tests${MLIBDIR:D/${MLIBDIR}}  TESTSBASE=      /usr/tests${MLIBDIR:D/${MLIBDIR}}
   
 # Override with tools versions if needed  # Override with tools versions if needed
 .if ${MKCTF:Uno} != "no" && !defined(NOCTF)  .if ${MKCTF:Uno} != "no" && !defined(NOCTF) && \
       (exists(${TOOL_CTFCONVERT}) || exists(/usr/bin/${TOOL_CTFCONVERT}))
 CTFCONVERT=     ${TOOL_CTFCONVERT}  CTFCONVERT=     ${TOOL_CTFCONVERT}
 CTFMERGE=       ${TOOL_CTFMERGE}  CTFMERGE=       ${TOOL_CTFMERGE}
 .endif  .endif
Legend:
Removed from v.1.1046  
changed lines
  Added in v.1.1046.2.7
CVSweb <webmaster@jp.NetBSD.org>