pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/tv-derecurse]: pkgsrc/mk merge from HEAD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0d713791f1d
branches:  tv-derecurse
changeset: 483971:b0d713791f1d
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 30 15:06:34 2004 +0000

description:
merge from HEAD

diffstat:

 mk/bsd.sites.mk                 |   3 +-
 mk/buildlink3/bsd.buildlink3.mk |   6 +-
 mk/compiler.mk                  |  12 +++++-
 mk/compiler/ccache.mk           |  28 ++++++++----
 mk/compiler/ccc.mk              |  40 +++++++++++------
 mk/compiler/distcc.mk           |  28 ++++++++----
 mk/compiler/gcc.mk              |  49 ++++++++++++---------
 mk/compiler/mipspro.mk          |  39 +++++++++++-----
 mk/compiler/sunpro.mk           |  39 +++++++++++-----
 mk/compiler/xlc.mk              |  39 +++++++++++-----
 mk/pthread.buildlink3.mk        |   4 +-
 mk/wrapper/bsd.wrapper.mk       |  90 +++++++++++++++++++++-------------------
 12 files changed, 232 insertions(+), 145 deletions(-)

diffs (truncated from 765 to 300 lines):

diff -r 57ec02860c28 -r b0d713791f1d mk/bsd.sites.mk
--- a/mk/bsd.sites.mk   Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/bsd.sites.mk   Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.1 2004/11/28 20:11:32 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.2 2004/11/30 15:06:34 tv Exp $
 #
 # Default MASTER_SITES
 
@@ -293,7 +293,6 @@
        http://www.fs.tum.de/~mrauch/OpenOffice/download/
 
 MASTER_SITE_CYGWIN+= \
-       http://mirror.mcs.anl.gov/cygwin/ \
        http://mirrors.kernel.org/sources.redhat.com/cygwin/ \
        http://mirrors.rcn.net/pub/sourceware/cygwin/ \
        http://mirrors.xmission.com/cygwin/ \
diff -r 57ec02860c28 -r b0d713791f1d mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.163.2.3 2004/11/28 20:11:32 tv Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.163.2.4 2004/11/30 15:06:35 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -986,8 +986,8 @@
 # building software.
 #
 .if defined(USE_LIBTOOL)
-_WRAPPEES+=            LIBTOOL
-_WRAPPEES+=            SHLIBTOOL
+WRAPPEES+=             LIBTOOL
+WRAPPEES+=             SHLIBTOOL
 _LIBTOOL=              ${WRAPPER_LIBTOOL}
 _SHLIBTOOL=            ${WRAPPER_SHLIBTOOL}
 .endif
diff -r 57ec02860c28 -r b0d713791f1d mk/compiler.mk
--- a/mk/compiler.mk    Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/compiler.mk    Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.38.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: compiler.mk,v 1.38.2.2 2004/11/30 15:06:34 tv Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -114,9 +114,19 @@
 .endfor
 _PKGSRC_COMPILER:=     ${_COMPILER} ${_PKGSRC_COMPILER}
 
+_COMPILER_STRIP_VARS=  # empty
+
 .for _compiler_ in ${_PKGSRC_COMPILER}
 .  include "../../mk/compiler/${_compiler_}.mk"
 .endfor
+.undef _compiler_
+
+# Strip the leading paths from the toolchain variables since we manipulate
+# the PATH to use the correct executable.
+#
+.for _var_ in ${_COMPILER_STRIP_VARS}
+${_var_}:=     ${${_var_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//:T} ${${_var_}:C/^/_asdf_/1:N_asdf_*}
+.endfor
 
 .if defined(ABI) && !empty(ABI)
 _WRAP_EXTRA_ARGS.CC+=  ${_COMPILER_ABI_FLAG.${ABI}}
diff -r 57ec02860c28 -r b0d713791f1d mk/compiler/ccache.mk
--- a/mk/compiler/ccache.mk     Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/compiler/ccache.mk     Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.20.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: ccache.mk,v 1.20.2.2 2004/11/30 15:06:35 tv Exp $
 
 .if !defined(COMPILER_CCACHE_MK)
 COMPILER_CCACHE_MK=    defined
@@ -36,18 +36,20 @@
 _CCACHEBASE_DEFAULT=   ${LOCALBASE}
 
 _CCACHE_DIR=   ${WRKDIR}/.ccache
-_CCACHE_LINKS= # empty
+_CCACHE_VARS=  # empty
 .  if !empty(_LANGUAGES.ccache:Mc)
+PKG_CC?=       ${CC}
+_CCACHE_VARS+= CC
 _CCACHE_CC:=   ${_CCACHE_DIR}/bin/${PKG_CC:T}
-_CCACHE_LINKS+=        _CCACHE_CC
+_ALIASES.CC?=  cc
 PKG_CC:=       ${_CCACHE_CC}
-CC=            ${PKG_CC:T}
 .  endif
 .  if !empty(_LANGUAGES.ccache:Mc++)
+PKG_CXX?=      ${CXX}
+_CCACHE_VARS+= CXX
 _CCACHE_CXX:=  ${_CCACHE_DIR}/bin/${PKG_CXX:T}
-_CCACHE_LINKS+=        _CCACHE_CXX
+_ALIASES.CXX?= c++
 PKG_CXX:=      ${_CCACHE_CXX}
-CXX=           ${PKG_CXX:T}
 .  endif
 
 # Prepend the path the to the compiler to the PATH
@@ -68,13 +70,19 @@
 .endif
 
 # Create symlinks for the compiler into ${WRKDIR}.
-.  for _target_ in ${_CCACHE_LINKS}
-.    if !target(${${_target_}})
-override-tools: ${${_target_}}
-${${_target_}}:
+.  for _var_ in ${_CCACHE_VARS}
+.    if !target(${_CCACHE_${_var_}})
+override-tools: ${_CCACHE_${_var_}}
+${_CCACHE_${_var_}}:
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        ${LN} -fs ${_CCACHEBASE}/bin/ccache ${.TARGET}
+.      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       if [ ! -x "${_alias_}" ]; then                                  \
+               ${LN} -fs ${_CCACHEBASE}/bin/ccache ${_alias_};         \
+       fi
+.      endfor
 .    endif
 .  endfor
 .endif # _USE_CCACHE == "yes"
diff -r 57ec02860c28 -r b0d713791f1d mk/compiler/ccc.mk
--- a/mk/compiler/ccc.mk        Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/compiler/ccc.mk        Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ccc.mk,v 1.2.2.1 2004/11/23 20:54:12 tv Exp $
+# $NetBSD: ccc.mk,v 1.2.2.2 2004/11/30 15:06:35 tv Exp $
 
 .if !defined(COMPILER_CCC_MK)
 COMPILER_CCC_MK=       defined
@@ -20,22 +20,28 @@
 .endfor
 
 _CCC_DIR=      ${WRKDIR}/.ccc
-_CCC_LINKS=    # empty
+_CCC_VARS=     # empty
 .if exists(/usr/bin/cc)
+_CCC_VARS+=    CC
 _CCC_CC=       ${_CCC_DIR}/cc
-_CCC_LINKS+=   _CCC_CC
-PKG_CC=                ${_CCC_CC}
-CC=            ${PKG_CC:T}
+_ALIASES.CC=   cc
 CCPATH=                /usr/bin/cc
+PKG_CC:=       ${_CCC_CC}
+.  if !empty(CC:M*gcc)
+CC:=           ${PKG_CC:T}     # ${CC} should be named "cc".
+.  endif
 .endif
-
 .if exists(/usr/bin/cxx)
+_CCC_VARS+=    CXX
 _CCC_CXX=      ${_CCC_DIR}/cxx
-_CCC_LINKS+=   _CCC_CXX
-PKG_CXX=       ${_CCC_CXX}
-CXX=           ${PKG_CXX:T}
+_ALIASES.CXX=  c++ cxx
 CXXPATH=       /usr/bin/cxx
+PKG_CXX:=      ${_CCC_CXX}
+.  if !empty(CXX:M*g++)
+CXX:=          ${PKG_CXX:T}     # ${CXX} should be named "cxx"
+.  endif
 .endif
+_COMPILER_STRIP_VARS+= ${_CCC_VARS}
 
 .if exists(${CCPATH}) && !defined(CC_VERSION_STRING)
 CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | awk '{print; exit(0);}'
@@ -59,16 +65,22 @@
 CXXFLAGS+=-ieee
 
 # Create compiler driver scripts in ${WRKDIR}.
-.for _target_ in ${_CCC_LINKS}
-.  if !target(${${_target_}})
-override-tools: ${${_target_}}
-${${_target_}}:
+.for _var_ in ${_CCC_VARS}
+.  if !target(${_CCC_${_var_}})
+override-tools: ${_CCC_${_var_}}        
+${_CCC_${_var_}}:
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        (${ECHO} '#!${TOOLS_SHELL}';                                    \
-        ${ECHO} 'exec /usr/bin/${${_target_}:T} "$$@"';        \
+        ${ECHO} 'exec /usr/bin/${.TARGET:T} "$$@"';                    \
        ) > ${.TARGET}
        ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
+.    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       if [ ! -x "${_alias_}" ]; then                                  \
+               ${LN} -f ${.TARGET} ${_alias_};                         \
+       fi
+.    endfor
 .  endif
 .endfor
 
diff -r 57ec02860c28 -r b0d713791f1d mk/compiler/distcc.mk
--- a/mk/compiler/distcc.mk     Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/compiler/distcc.mk     Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.21.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: distcc.mk,v 1.21.2.2 2004/11/30 15:06:35 tv Exp $
 
 .if !defined(COMPILER_DISTCC_MK)
 COMPILER_DISTCC_MK=    defined
@@ -36,18 +36,20 @@
 _DISTCCBASE_DEFAULT=   ${LOCALBASE}
 
 _DISTCC_DIR=   ${WRKDIR}/.distcc
-_DISTCC_LINKS= # empty
+_DISTCC_VARS=  # empty
 .  if !empty(_LANGUAGES.distcc:Mc)
+PKG_CC?=       ${CC}
+_DISTCC_VARS+= CC
 _DISTCC_CC:=   ${_DISTCC_DIR}/bin/${PKG_CC:T}
-_DISTCC_LINKS+=        _DISTCC_CC
+_ALIASES.CC?=  cc
 PKG_CC:=       ${_DISTCC_CC}
-CC=            ${PKG_CC:T}
 .  endif
 .  if !empty(_LANGUAGES.distcc:Mc++)
+PKG_CXX?=      ${CXX}
+_DISTCC_VARS+= CXX
 _DISTCC_CXX:=  ${_DISTCC_DIR}/bin/${PKG_CXX:T}
-_DISTCC_LINKS+=        _DISTCC_CXX
+_ALIASES.CXX?= c++
 PKG_CXX:=      ${_DISTCC_CXX}
-CXX=           ${PKG_CXX:T}
 .  endif
 
 # Prepend the path to the compiler to the PATH.
@@ -69,13 +71,19 @@
 .endif
 
 # Create symlinks for the compiler into ${WRKDIR}.
-.  for _target_ in ${_DISTCC_LINKS}
-.    if !target(${${_target_}})
-override-tools: ${${_target_}}
-${${_target_}}:
+.  for _var_ in ${_DISTCC_VARS}
+.    if !target(${_DISTCC_${_var_}})
+override-tools: ${_DISTCC_${_var_}}
+${_DISTCC_${_var_}}:
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        ${LN} -fs ${_DISTCCBASE}/bin/distcc ${.TARGET}
+.      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       if [ ! -x "${_alias_}" ]; then                                  \
+               ${LN} -fs ${_DISTCCBASE}/bin/distcc ${_alias_};         \
+       fi
+.      endfor
 .    endif
 .  endfor
 .endif # _USE_DISTCC == "yes"
diff -r 57ec02860c28 -r b0d713791f1d mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Sun Nov 28 20:11:32 2004 +0000
+++ b/mk/compiler/gcc.mk        Tue Nov 30 15:06:34 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.74.2.1 2004/11/23 20:54:12 tv Exp $
+# $NetBSD: gcc.mk,v 1.74.2.2 2004/11/30 15:06:35 tv Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=       defined
@@ -334,7 +334,7 @@
 # GCC executables.
 #
 _GCC_DIR=      ${WRKDIR}/.gcc
-_GCC_LINKS=    # empty
+_GCC_VARS=     # empty
 
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
 _GCCBINDIR=    ${_GCC_PREFIX}bin
@@ -342,34 +342,35 @@
 _GCCBINDIR=    ${_CC:H}
 .endif
 .if exists(${_GCCBINDIR}/gcc)
+_GCC_VARS+=    CC
 _GCC_CC=       ${_GCC_DIR}/bin/gcc
-_GCC_LINKS+=   _GCC_CC
-PKG_CC=                ${_GCC_CC}
-CC=            ${PKG_CC:T}
+_ALIASES.CC=   cc gcc
 CCPATH=                ${_GCCBINDIR}/gcc
+PKG_CC:=       ${_GCC_CC}
 .endif
-.if exists(${_GCCBINDIR}/cpp) && ${OPSYS} != "Darwin"
+.if exists(${_GCCBINDIR}/cpp)
+_GCC_VARS+=    CPP
 _GCC_CPP=      ${_GCC_DIR}/bin/cpp
-_GCC_LINKS+=   _GCC_CPP
-PKG_CPP=       ${_GCC_CPP}
-CPP=           ${PKG_CPP:T}
+_ALIASES.CPP=  cpp
+CPPPATH=       ${_GCCBINDIR}/cpp
+PKG_CPP:=      ${_GCC_CPP}
 .endif



Home | Main Index | Thread Index | Old Index