pkgsrc-Changes-HG archive

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

[pkgsrc/tv-derecurse]: pkgsrc/mk sync with HEAD



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd233d292b0a
branches:  tv-derecurse
changeset: 483996:cd233d292b0a
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Feb 15 16:25:22 2005 +0000

description:
sync with HEAD

diffstat:

 mk/bsd.pkg.mk                   |  25 +++++++-----
 mk/buildlink3/bsd.buildlink3.mk |   8 +++-
 mk/compiler.mk                  |   5 +-
 mk/compiler/icc.mk              |  81 +++++++++++++++++++++++++++++++++++++++++
 mk/install/files                |   5 +-
 mk/platform/AIX.mk              |   4 +-
 mk/wrapper/arg-pp-darwin-gcc    |  23 +++++++++++-
 mk/wrapper/arg-pp-main          |  19 +---------
 mk/wrapper/bsd.wrapper.mk       |  23 +++++++++++-
 mk/wrapper/cmd-sink-icc-cc      |  59 +++++++++++++++++++++++++++++
 mk/wrapper/logic                |   6 +-
 mk/wrapper/transform-icc-cc     |  68 ++++++++++++++++++++++++++++++++++
 12 files changed, 284 insertions(+), 42 deletions(-)

diffs (truncated from 511 to 300 lines):

diff -r 8df7f47554d1 -r cd233d292b0a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue Feb 15 16:25:22 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1540.2.22 2005/02/11 17:00:21 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1540.2.23 2005/02/15 16:25:22 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -1285,14 +1285,14 @@
        fi
 .  if defined(PKG_DEVELOPER) && (${CHECK_FILES} == "YES")
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO_MSG} "${_PKGSRC_IN}> Generating pre-install file lists"
-       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PREFIX} -type f -or -type l \
+       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PREFIX} -type f -or -type l -print \
                2>/dev/null ${CHECK_FILES_SKIP_CMD} >${WRKDIR}/.prefix.pre \
                || ${TRUE}
 .    if ${CHECK_FILES_STRICT} == "YES"
-       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PKG_SYSCONFDIR} \
+       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PKG_SYSCONFDIR} -print \
                2>/dev/null ${CHECK_FILES_SKIP_CMD} >${WRKDIR}/.sysconfdir.pre \
                || ${TRUE}
-       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${VARBASE} \
+       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${VARBASE} -print \
                2>/dev/null ${CHECK_FILES_SKIP_CMD} >${WRKDIR}/.varbase.pre \
                || ${TRUE}
 .    endif
@@ -1388,14 +1388,14 @@
 .PHONY: post-install-check-files
 post-install-check-files:
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO_MSG} "${_PKGSRC_IN}> Generating post-install file lists"
-       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PREFIX} -type f -or -type l \
+       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PREFIX} -type f -or -type l -print \
                2>/dev/null ${CHECK_FILES_SKIP_CMD} >${WRKDIR}/.prefix.post \
                || ${TRUE}
 .  if ${CHECK_FILES_STRICT} == "YES"
-       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PKG_SYSCONFDIR} \
+       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${PKG_SYSCONFDIR} -print \
                2>/dev/null ${CHECK_FILES_SKIP_CMD} >${WRKDIR}/.sysconfdir.post\
                || ${TRUE}
-       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${VARBASE} \
+       ${_PKG_SILENT}${_PKG_DEBUG}${FIND} ${VARBASE} -print \
                2>/dev/null ${CHECK_FILES_SKIP_CMD} >${WRKDIR}/.varbase.post \
                || ${TRUE}
 .  endif
@@ -2834,10 +2834,13 @@
                ${FALSE};                                               \
        fi;                                                             \
        while true; do                                                  \
-               if ${TEST} -f /var/run/dmesg.boot -a -f ${LOCKFILE} -a  \
-                    /var/run/dmesg.boot -nt ${LOCKFILE}; then          \
-                       ${ECHO} "=> Removing stale ${LOCKFILE}";        \
-                       ${RM} ${LOCKFILE};                              \
+               : "Remove lock files older than the last reboot";       \
+               if ${TEST} -f /var/run/dmesg.boot -a -f ${LOCKFILE}; then \
+                       rebooted=`${FIND} /var/run/dmesg.boot -newer ${LOCKFILE} -print`; \
+                       if ${TEST} x"$$rebooted" != x; then             \
+                               ${ECHO} "=> Removing stale ${LOCKFILE}"; \
+                               ${RM} ${LOCKFILE};                      \
+                       fi;                                             \
                fi;                                                     \
                ${SHLOCK} -f ${LOCKFILE} -p $$ppid && break;            \
                ${ECHO} "=> Lock is held by pid `cat ${LOCKFILE}`";     \
diff -r 8df7f47554d1 -r cd233d292b0a mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Tue Feb 15 16:25:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.163.2.4 2004/11/30 15:06:35 tv Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.163.2.5 2005/02/15 16:25:23 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1000,6 +1000,12 @@
 # We need to "unbuildlinkify" any libtool archives.
 _BLNK_WRAP_LT_UNTRANSFORM_SED= ${SUBST_SED.unwrap}
 
+# The libtool wrapper should do all of the same transformations as the
+# compiler wrapper since the primary mode of operation of the wrapper
+# assumes it's being in either compiler or link mode.
+#
+_WRAP_ARG_PP.LIBTOOL=          ${_WRAP_ARG_PP.CC}
+
 _WRAP_BUILDCMD.LIBTOOL=                ${WRAPPER_TMPDIR}/buildcmd-libtool
 _WRAP_CACHE.LIBTOOL=           ${WRAPPER_TMPDIR}/cache-libtool
 _WRAP_CACHE_BODY.LIBTOOL=      ${WRAPPER_TMPDIR}/cache-body-libtool
diff -r 8df7f47554d1 -r cd233d292b0a mk/compiler.mk
--- a/mk/compiler.mk    Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/compiler.mk    Tue Feb 15 16:25:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.38.2.5 2005/01/13 20:11:55 tv Exp $
+# $NetBSD: compiler.mk,v 1.38.2.6 2005/02/15 16:25:22 tv Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -14,6 +14,7 @@
 #              ccache          compiler cache (chainable)
 #              distcc          distributed C/C++ (chainable)
 #              f2c             Fortran 77 to C compiler (chainable)
+#              icc             Intel C++ Compiler (Linux)
 #              gcc             GNU
 #              mipspro         Silicon Graphics, Inc. MIPSpro (n32/n64)
 #              mipspro-ucode   Silicon Graphics, Inc. MIPSpro (o32)
@@ -81,7 +82,7 @@
 _USE_PKGSRC_GCC=       yes
 .endif
 
-_COMPILERS=            ccc gcc mipspro mipspro-ucode sunpro xlc
+_COMPILERS=            ccc gcc icc mipspro mipspro-ucode sunpro xlc
 _PSEUDO_COMPILERS=     ccache distcc f2c
 
 .if defined(NOT_FOR_COMPILER) && !empty(NOT_FOR_COMPILER)
diff -r 8df7f47554d1 -r cd233d292b0a mk/compiler/icc.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/compiler/icc.mk        Tue Feb 15 16:25:22 2005 +0000
@@ -0,0 +1,81 @@
+# $NetBSD: icc.mk,v 1.1.2.2 2005/02/15 16:25:23 tv Exp $
+
+.if !defined(COMPILER_ICC_MK)
+COMPILER_ICC_MK=       defined
+
+.include "../../mk/bsd.prefs.mk"
+
+ICCBASE?=              /opt/intel_cc_80
+
+# LANGUAGES.<compiler> is the list of supported languages by the
+# compiler.
+#
+LANGUAGES.icc=         # empty
+
+_ICC_DIR=              ${WRKDIR}/.icc
+_ICC_VARS=             # empty
+.if exists(${ICCBASE}/bin/icc)
+LANGUAGES.icc+=                c
+_ICC_VARS+=            CC
+_ICC_CC=               ${_ICC_DIR}/bin/icc
+_ALIASES.CC=           cc
+CCPATH=                        ${ICCBASE}/bin/icc
+PKG_CC:=               ${_ICC_CC}
+LANGUAGES.icc+=                c++
+_ICC_VARS+=            CXX
+_ICC_CXX=              ${_ICC_DIR}/bin/icpc
+_ALIASES.CXX=          CC c++
+CXXPATH=               ${ICCBASE}/bin/icpc
+PKG_CXX:=              ${_ICC_CXX}
+.endif
+_COMPILER_STRIP_VARS+= ${_ICC_VARS}
+
+# icc passes rpath directives to the linker using "-Wl,-R".
+_LINKER_RPATH_FLAG=    -Wl,-R
+
+# icc passes rpath directives to the linker using "-Wl,-R".
+_COMPILER_RPATH_FLAG=  -Wl,-R
+
+.if exists(${CCPATH})
+CC_VERSION_STRING!=    ${CCPATH} -V 2>&1 | ${GREP} '^Intel'
+_CC_VERSION!=          ${CCPATH} -v 2>&1 || ${TRUE}
+CC_VERSION=            Intel C++ Compiler ${_CC_VERSION}
+.else
+CC_VERSION_STRING?=    ${CC_VERSION}
+CC_VERSION?=           Intel C++ Compiler
+.endif
+
+# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the
+# ones requested by the package in USE_LANGUAGES.
+#
+_LANGUAGES.icc=        # empty
+.for _lang_ in ${USE_LANGUAGES}
+_LANGUAGES.icc+=       ${LANGUAGES.icc:M${_lang_}}
+.endfor
+
+# Prepend the path to the compiler to the PATH.
+.if !empty(_LANGUAGES.icc)
+PREPEND_PATH+= ${_ICC_DIR}/bin
+.endif
+
+# Create compiler driver scripts in ${WRKDIR}.
+.for _var_ in ${_ICC_VARS}
+.  if !target(${_ICC_${_var_}})
+override-tools: ${_ICC_${_var_}}        
+${_ICC_${_var_}}:
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       (${ECHO} '#!${TOOLS_SHELL}';                                    \
+        ${ECHO} 'exec ${ICCBASE}/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
+
+.endif # COMPILER_ICC_MK
diff -r 8df7f47554d1 -r cd233d292b0a mk/install/files
--- a/mk/install/files  Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/install/files  Tue Feb 15 16:25:22 2005 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: files,v 1.1.2.2 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: files,v 1.1.2.3 2005/02/15 16:25:23 tv Exp $
 #
 # +FILES - reference-counted configuration file management script
 #
@@ -162,8 +162,7 @@
                        "")
                                if ${TEST} -f "$preexist"; then
                                        :
-                               elif ${TEST} -f "$file" -a -f "$f_eg" -a \
-                                            ! "$file" -ef "$f_eg" && \
+                               elif ${TEST} -f "$file" -a -f "$f_eg" && \
                                             ${CMP} -s "$file" "$f_eg"; then
                                        ${RM} -f "$file"
                                fi
diff -r 8df7f47554d1 -r cd233d292b0a mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/platform/AIX.mk        Tue Feb 15 16:25:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.4.2.2 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: AIX.mk,v 1.4.2.3 2005/02/15 16:25:23 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -6,7 +6,7 @@
 BASENAME?=     /usr/bin/basename
 CAT?=          /bin/cat
 CHMOD?=                /bin/chmod
-CHOWN?=                /usr/sbin/chown
+CHOWN?=                /usr/bin/chown
 CHGRP?=                /usr/bin/chgrp
 CMP?=          /usr/bin/cmp
 CP?=           /bin/cp
diff -r 8df7f47554d1 -r cd233d292b0a mk/wrapper/arg-pp-darwin-gcc
--- a/mk/wrapper/arg-pp-darwin-gcc      Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/wrapper/arg-pp-darwin-gcc      Tue Feb 15 16:25:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-darwin-gcc,v 1.1.2.2 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: arg-pp-darwin-gcc,v 1.1.2.3 2005/02/15 16:25:23 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -36,6 +36,27 @@
 
 case $arg in
 ######################################################################
+# Split direct paths to Darwin "dylib" shared libraries into the
+# "-Ldir -llib" equivalent.
+######################################################################
+/*/lib*.dylib)
+       dir="${arg%/lib*.dylib}"
+       lib="${arg#$dir/lib}"
+       case $lib in
+       */*)            argok=yes; argmatch=yes ;;
+       *.dylib)        lib="${lib%.dylib}" ;;
+       esac
+       case $argmatch in
+       yes)    ;;
+       *)      prepend_queue argbuf "-l$lib"
+               $debug_log $wrapperlog "    (arg-pp-darwin-gcc) pre:  -l$lib"
+               prepend_queue argbuf "-L$dir"
+               $debug_log $wrapperlog "    (arg-pp-darwin-gcc) pre:  -L$dir"
+               argmatch=yes
+               ;;
+       esac
+       ;;
+######################################################################
 # Darwin's linker uses:
 #
 #      -dylib_file /path/shlib:/path2/shlib
diff -r 8df7f47554d1 -r cd233d292b0a mk/wrapper/arg-pp-main
--- a/mk/wrapper/arg-pp-main    Fri Feb 11 17:00:21 2005 +0000
+++ b/mk/wrapper/arg-pp-main    Tue Feb 15 16:25:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-pp-main,v 1.1.2.3 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: arg-pp-main,v 1.1.2.4 2005/02/15 16:25:23 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -75,23 +75,6 @@
                ;;
        esac
        ;;
-/*/lib*.dylib)  # Darwin      
-       dir="${arg%/lib*.dylib}"
-       lib="${arg#$dir/lib}" 
-       case $lib in
-       */*)            argok=yes; argmatch=yes ;;
-       *.dylib)        lib="${lib%.dylib}" ;;
-       esac
-       case $argmatch in
-       yes)    ;;
-       *)      prepend_queue argbuf "-l$lib"
-               $debug_log $wrapperlog "    (arg-pp-main) pre:  -l$lib"
-               prepend_queue argbuf "-L$dir"
-               $debug_log $wrapperlog "    (arg-pp-main) pre:  -L$dir"
-               argmatch=yes
-               ;;



Home | Main Index | Thread Index | Old Index