[pkgsrc/pkgsrc-2004Q2]: pkgsrc/lang/gcc Pullup ticket 43 to the pkgsrc-2004Q2...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37da92f3df96
branches:  pkgsrc-2004Q2
changeset: 476707:37da92f3df96
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jul 06 22:36:25 2004 +0000

description:
Pullup ticket 43 to the pkgsrc-2004Q2 branch, requested by Gavan Fantom.

        Module Name:    pkgsrc
        Committed By:   gavan
        Date:           Tue Jun 29 13:17:42 UTC 2004

        Modified Files:
                pkgsrc/lang/gcc: buildlink3.mk

        Log Message:
        gcc installs in a subdirectory of ${BUILDLINK_PREFIX.gcc}, so make
        sure that appropriate subdirectory is passed in BUILDLINK_LIBDIRS.gcc.

        Fixes PR 26109. OK'd by grant.

and

        Module Name:    pkgsrc
        Committed By:   gavan
        Date:           Tue Jun 29 13:24:31 UTC 2004

        Modified Files:
                pkgsrc/lang/gcc: buildlink3.mk

        Log Message:
        I can't count.

diffstat:

 lang/gcc/buildlink3.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 9cc3fb3bb881 -r 37da92f3df96 lang/gcc/buildlink3.mk
--- a/lang/gcc/buildlink3.mk    Tue Jul 06 22:32:49 2004 +0000
+++ b/lang/gcc/buildlink3.mk    Tue Jul 06 22:36:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5.4.1 2004/07/06 22:36:25 agc Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=    ${GCC_BUILDLINK3_MK}+
@@ -16,7 +16,8 @@
 BUILDLINK_DEPENDS.gcc+=                gcc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=      ../../lang/gcc
 BUILDLINK_LIBDIRS.gcc?=                \
-       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
+       ${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc}\///}lib \
+       ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)