[pkgsrc/pkgsrc-2005Q2]: pkgsrc/mk/wrapper Pullup ticket 630 - requested by gr...

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfb5a84b0c91
branches:  pkgsrc-2005Q2
changeset: 495917:dfb5a84b0c91
user:      snj <snj%pkgsrc.org@localhost>
date:      Fri Jul 29 07:38:30 2005 +0000

description:
Pullup ticket 630 - requested by grant beattie
infrastructure fixes for sunpro

Revisions pulled up:
- pkgsrc/mk/wrapper/bsd.wrapper.mk      1.33-1.34
- pkgsrc/mk/wrapper/cmd-sink-sunpro-cxx 1.1

    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Wed Jul  6 03:31:24 UTC 2005

    Modified Files:
            pkgsrc/mk/wrapper: bsd.wrapper.mk
    Added Files:
            pkgsrc/mk/wrapper: cmd-sink-sunpro-cxx

    Log Message:
    add cmd-sink for sunpro C++ which links shared libraries with the
    standard C++ runtime libraries.

    we need to explicitly do this because ${CXX} only links against the
    C++ runtime libraries when building an executable, not a shared
    object. this results in executables linked against libraries linked by
    ${CXX} unable to resolve C++ symbols at runtime.

    fixes packages which link shared libraries using ${CXX}, including
    graphics/glu, databases/db4, and packages which use shared libraries
    provided by these packages.
----
    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Wed Jul  6 03:35:28 UTC 2005

    Modified Files:
            pkgsrc/mk/wrapper: bsd.wrapper.mk

    Log Message:
    update copyright year

diffstat:

 mk/wrapper/bsd.wrapper.mk      |  11 ++++++-
 mk/wrapper/cmd-sink-sunpro-cxx |  61 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diffs (98 lines):

diff -r b2e871df1d2d -r dfb5a84b0c91 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Fri Jul 29 07:33:59 2005 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Fri Jul 29 07:38:30 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: bsd.wrapper.mk,v 1.32 2005/05/20 22:40:36 rillig Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.32.2.1 2005/07/29 07:38:30 snj Exp $
 #
-# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -256,6 +256,7 @@
 .endif
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
+_WRAP_CMD_SINK.CXX=    ${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx
 _WRAP_CACHE_BODY.CC=   ${WRAPPER_TMPDIR}/cache-body-sunpro-cc
 _WRAP_TRANSFORM.CC=    ${WRAPPER_TMPDIR}/transform-sunpro-cc
 _WRAP_CACHE_BODY.CXX=  ${_WRAP_CACHE_BODY.CC}
@@ -541,6 +542,12 @@
        ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}                    \
                | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
+${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx:                                 \
+               ${WRAPPER_SRCDIR}/cmd-sink-sunpro-cxx
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+       ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}                    \
+               | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/transform-sunpro-cc:                                 \
                ${WRAPPER_SRCDIR}/transform-sunpro-cc
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff -r b2e871df1d2d -r dfb5a84b0c91 mk/wrapper/cmd-sink-sunpro-cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/cmd-sink-sunpro-cxx    Fri Jul 29 07:38:30 2005 +0000
@@ -0,0 +1,61 @@
+# $NetBSD: cmd-sink-sunpro-cxx,v 1.1.2.2 2005/07/29 07:38:30 snj Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# if we are linking a shared library, ensure that the C++ runtime
+# libraries are linked so that all symbols can be resolved at runtime.
+shlib=
+libCstd=
+libCrun=
+
+while ! queue_is_empty cmdbuf; do
+       pop_queue cmdbuf arg
+       $debug_log $wrapperlog "    (cmd-sink-sunpro-cxx) pop: $arg"
+       case $arg in
+       -G)     shlib=yes ;;
+       -lCstd) libCstd=yes ;;
+       -lCrun) libCrun=yes ;;
+       esac
+       . $buildcmd
+done
+
+if $test -n "$shlib"; then
+       if $test "$libCstd" != yes; then
+               arg=-lCstd
+               $debug_log $wrapperlog "    (cmd-sink-sunpro-cxx) pop: $arg"
+               . $buildcmd
+       fi
+       if $test "$libCrun" != yes; then
+               arg=-lCrun
+               $debug_log $wrapperlog "    (cmd-sink-sunpro-cxx) pop: $arg"
+               . $buildcmd
+       fi
+fi