[pkgsrc/trunk]: pkgsrc/lang List the correct directories for finding GCC libr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f7e9501837f
branches:  trunk
changeset: 467669:7f7e9501837f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 05 00:28:35 2004 +0000

description:
List the correct directories for finding GCC libraries so that they will
be added automatically to library and run-time library search paths.

diffstat:

 lang/gcc/buildlink3.mk       |  4 +++-
 lang/gcc3-c++/buildlink3.mk  |  4 +++-
 lang/gcc3-c/buildlink3.mk    |  4 +++-
 lang/gcc3-f77/buildlink3.mk  |  4 +++-
 lang/gcc3-java/buildlink3.mk |  4 +++-
 lang/gcc3-objc/buildlink3.mk |  4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diffs (108 lines):

diff -r 7cb76c494886 -r 7f7e9501837f lang/gcc/buildlink3.mk
--- a/lang/gcc/buildlink3.mk    Thu Feb 05 00:09:51 2004 +0000
+++ b/lang/gcc/buildlink3.mk    Thu Feb 05 00:28:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:09:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=    ${GCC_BUILDLINK3_MK}+
@@ -10,6 +10,8 @@
 BUILDLINK_DEPENDS+=            gcc
 BUILDLINK_DEPENDS.gcc+=                gcc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=      ../../lang/gcc
+BUILDLINK_LIBDIRS.gcc?=                \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)
diff -r 7cb76c494886 -r 7f7e9501837f lang/gcc3-c++/buildlink3.mk
--- a/lang/gcc3-c++/buildlink3.mk       Thu Feb 05 00:09:51 2004 +0000
+++ b/lang/gcc3-c++/buildlink3.mk       Thu Feb 05 00:28:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3CXX_BUILDLINK3_MK:=        ${GCC3CXX_BUILDLINK3_MK}+
@@ -13,6 +13,8 @@
 BUILDLINK_DEPENDS+=            gcc3cxx
 BUILDLINK_DEPENDS.gcc3cxx+=    gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3cxx?=  ../../lang/gcc3-c++
+BUILDLINK_LIBDIRS.gcc3cxx?=    \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)
diff -r 7cb76c494886 -r 7f7e9501837f lang/gcc3-c/buildlink3.mk
--- a/lang/gcc3-c/buildlink3.mk Thu Feb 05 00:09:51 2004 +0000
+++ b/lang/gcc3-c/buildlink3.mk Thu Feb 05 00:28:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3C_BUILDLINK3_MK:=  ${GCC3C_BUILDLINK3_MK}+
@@ -13,6 +13,8 @@
 BUILDLINK_DEPENDS+=            gcc3c
 BUILDLINK_DEPENDS.gcc3c+=      gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3c?=    ../../lang/gcc3-c
+BUILDLINK_LIBDIRS.gcc3c?=      \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)
diff -r 7cb76c494886 -r 7f7e9501837f lang/gcc3-f77/buildlink3.mk
--- a/lang/gcc3-f77/buildlink3.mk       Thu Feb 05 00:09:51 2004 +0000
+++ b/lang/gcc3-f77/buildlink3.mk       Thu Feb 05 00:28:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3F77_BUILDLINK3_MK:=        ${GCC3F77_BUILDLINK3_MK}+
@@ -13,6 +13,8 @@
 BUILDLINK_DEPENDS+=            gcc3f77
 BUILDLINK_DEPENDS.gcc3f77+=    gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3f77?=  ../../lang/gcc3-f77
+BUILDLINK_LIBDIRS.gcc3f77?=    \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3f77}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)
diff -r 7cb76c494886 -r 7f7e9501837f lang/gcc3-java/buildlink3.mk
--- a/lang/gcc3-java/buildlink3.mk      Thu Feb 05 00:09:51 2004 +0000
+++ b/lang/gcc3-java/buildlink3.mk      Thu Feb 05 00:28:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3JAVA_BUILDLINK3_MK:=       ${GCC3JAVA_BUILDLINK3_MK}+
@@ -13,6 +13,8 @@
 BUILDLINK_DEPENDS+=            gcc3java
 BUILDLINK_DEPENDS.gcc3java+=   gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3java?= ../../lang/gcc3-java
+BUILDLINK_LIBDIRS.gcc3java?=   \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3java}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)
diff -r 7cb76c494886 -r 7f7e9501837f lang/gcc3-objc/buildlink3.mk
--- a/lang/gcc3-objc/buildlink3.mk      Thu Feb 05 00:09:51 2004 +0000
+++ b/lang/gcc3-objc/buildlink3.mk      Thu Feb 05 00:28:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3OBJC_BUILDLINK3_MK:=       ${GCC3OBJC_BUILDLINK3_MK}+
@@ -13,6 +13,8 @@
 BUILDLINK_DEPENDS+=            gcc3objc
 BUILDLINK_DEPENDS.gcc3objc+=   gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3objc?= ../../lang/gcc3-objc
+BUILDLINK_LIBDIRS.gcc3objc?=   \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3objc}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(USE_GCC_SHLIB)