diff options
| author | agc <agc> | 2004-07-06 22:36:25 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-06 22:36:25 +0000 |
| commit | 30bcc5d55fa12e77f6b07166bb06d77f5517635d (patch) | |
| tree | 279c73f6b4b9b5433a04dd1c3aee70671ab81226 /lang | |
| parent | db822d57fcd6b63e1858fce1ab9fe5d2c5b0d406 (diff) | |
| download | pkgsrc-30bcc5d55fa12e77f6b07166bb06d77f5517635d.tar.gz | |
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 (limited to 'lang')
| -rw-r--r-- | lang/gcc/buildlink3.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk index d6fee20ee6b..6500318d5d4 100644 --- a/lang/gcc/buildlink3.mk +++ b/lang/gcc/buildlink3.mk @@ -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_PACKAGES+= gcc 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) |