[pkgsrc/trunk]: pkgsrc/lang Changes to support new compiler selection framework.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4370d7d07dc
branches:  trunk
changeset: 467464:e4370d7d07dc
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 01 02:11:06 2004 +0000

description:
Changes to support new compiler selection framework.

diffstat:

 lang/gcc/buildlink2.mk  |  16 ++++++++++------
 lang/gcc3/buildlink2.mk |  22 +++++++++-------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diffs (98 lines):

diff -r f284f03fdd48 -r e4370d7d07dc lang/gcc/buildlink2.mk
--- a/lang/gcc/buildlink2.mk    Sun Feb 01 01:57:39 2004 +0000
+++ b/lang/gcc/buildlink2.mk    Sun Feb 01 02:11:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.15 2003/09/12 15:54:43 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.16 2004/02/01 02:11:06 jlam Exp $
 
 # Do not directly include this file in package Makefiles. It is
 # automatically included when required based on USE_GCC2.
@@ -6,9 +6,10 @@
 .if !defined(GCC2_BUILDLINK2_MK)
 GCC2_BUILDLINK2_MK=    # defined
 
+BUILDLINK_PACKAGES+=           gcc
 BUILDLINK_DEPENDS.gcc?=                gcc>=${GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=      ../../lang/gcc
-
+#
 # Packages that link against shared gcc libraries need a full
 # dependency.
 #
@@ -19,10 +20,6 @@
 .endif
 
 BUILDLINK_PREFIX.gcc=  ${LOCALBASE}
-_GCC_PREFIX=           ${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}
-
-BUILDLINK_PACKAGES+=   gcc
-
 BUILDLINK_WRAPPER_ENV+=        \
        COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
@@ -41,7 +38,14 @@
 BUILDLINK_FILES.gcc+=  ${_GCC_SUBPREFIX}lib/libstdc++.*
 
 BUILDLINK_TARGETS+=    gcc-buildlink
+BUILDLINK_TARGETS+=    libstdc++-buildlink-la
 
 gcc-buildlink: _BUILDLINK_USE
 
+libstdc++-buildlink-la:               
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       lafile="${BUILDLINK_DIR}/lib/libstdc++.la";                     \
+       libpattern="/usr/lib/libstdc++.*";                              \
+       ${BUILDLINK_FAKE_LA}
+
 .endif # GCC2_BUILDLINK2_MK
diff -r f284f03fdd48 -r e4370d7d07dc lang/gcc3/buildlink2.mk
--- a/lang/gcc3/buildlink2.mk   Sun Feb 01 01:57:39 2004 +0000
+++ b/lang/gcc3/buildlink2.mk   Sun Feb 01 02:11:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/09/12 15:54:44 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/02/01 02:11:06 jlam Exp $
 
 # Do not directly include this file in package Makefiles. It is
 # automatically included when required based on USE_GCC3.
@@ -6,6 +6,7 @@
 .if !defined(GCC3_BUILDLINK2_MK)
 GCC3_BUILDLINK2_MK=    # defined
 
+BUILDLINK_PACKAGES+=           gcc
 BUILDLINK_DEPENDS.gcc?=                gcc3>=${GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=      ../../lang/gcc3
 
@@ -19,18 +20,6 @@
 .endif
 
 BUILDLINK_PREFIX.gcc=  ${LOCALBASE}
-_GCC_PREFIX=           ${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}
-_GCC_LIBGCCDIR!=                                               \
-  if [ -x ${_GCC_PREFIX}bin/gcc ]; then                                \
-    dirname `${_GCC_PREFIX}bin/gcc --print-libgcc-file-name`;  \
-  else                                                         \
-    ${ECHO} not-defined;                                       \
-  fi
-_GCC_ARCHSUBDIR= \
-  ${_GCC_LIBGCCDIR:S|^${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}||}
-
-BUILDLINK_PACKAGES+=   gcc
-
 BUILDLINK_WRAPPER_ENV+=        \
        COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
@@ -58,7 +47,14 @@
 BUILDLINK_FILES.gcc+=  ${_GCC_SUBPREFIX}lib/libsupc++.*
 
 BUILDLINK_TARGETS+=    gcc-buildlink
+BUILDLINK_TARGETS+=    libstdc++-buildlink-la
 
 gcc-buildlink: _BUILDLINK_USE
 
+libstdc++-buildlink-la:               
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       lafile="${BUILDLINK_DIR}/lib/libstdc++.la";                     \
+       libpattern="/usr/lib/libstdc++.*";                              \
+       ${BUILDLINK_FAKE_LA}
+
 .endif # GCC3_BUILDLINK2_MK