[pkgsrc/trunk]: pkgsrc/lang/gcc44 Fix some path issues which caused buildlink...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fdfc0b9e835
branches:  trunk
changeset: 399352:4fdfc0b9e835
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Fri Sep 18 13:35:41 2009 +0000

description:
Fix some path issues which caused buildlink of all libs and headers in /usr/pkg.

diffstat:

 lang/gcc44/buildlink3.mk |  21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r 982bb3c40714 -r 4fdfc0b9e835 lang/gcc44/buildlink3.mk
--- a/lang/gcc44/buildlink3.mk  Fri Sep 18 13:29:31 2009 +0000
+++ b/lang/gcc44/buildlink3.mk  Fri Sep 18 13:35:41 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/18 11:24:50 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/09/18 13:35:41 dmcmahill Exp $
 
 BUILDLINK_TREE+=       gcc44
 
@@ -8,24 +8,27 @@
 FIND_PREFIX:=  BUILDLINK_PREFIX.gcc44=gcc44
 .include "../../mk/find-prefix.mk"
 
+_GCC44_SUBDIR= gcc44
+_GCC44_PREFIX= ${BUILDLINK_PREFIX.gcc44}/${_GCC44_SUBDIR}
+
 BUILDLINK_API_DEPENDS.gcc44+=  gcc44>=${_GCC_REQD}
 BUILDLINK_ABI_DEPENDS.gcc44?=  gcc44>=4.4.0
 BUILDLINK_PKGSRCDIR.gcc44?=    ../../lang/gcc44
 
-.  if exists(${BUILDLINK_PREFIX.gcc44}/bin/gcc)
+.  if exists(${_GCC44_PREFIX}/bin/gcc)
 
 # logic for detecting the ADA compiler (not yet supported)
-#gcc44_GNAT1!=${BUILDLINK_PREFIX.gcc44}/bin/gcc -print-prog-name=gnat1
+#gcc44_GNAT1!=${_GCC44_PREFIX}/bin/gcc -print-prog-name=gnat1
 #.    if exists(${gcc44_GNAT1})
-#CONFIGURE_ENV+=       ADAC=${BUILDLINK_PREFIX.gcc44}/bin/gcc
-#MAKE_ENV+=    ADAC=${BUILDLINK_PREFIX.gcc44}/bin/gcc
+#CONFIGURE_ENV+=       ADAC=${_GCC44_PREFIX}/bin/gcc
+#MAKE_ENV+=    ADAC=${_GCC44_PREFIX}/bin/gcc
 #.    endif
 
 # add libraries
-BUILDLINK_LIBDIRS.gcc44+=      lib
+BUILDLINK_LIBDIRS.gcc44+=      ${_GCC44_SUBDIR}/lib
 
 # find the gcc architecture
-gcc44_GCC_ARCHDIR!=    ${DIRNAME} `${BUILDLINK_PREFIX.gcc44}/bin/gcc --print-libgcc-file-name`
+gcc44_GCC_ARCHDIR!=    ${DIRNAME} `${_GCC44_PREFIX}/bin/gcc --print-libgcc-file-name`
 
 # add the architecture dep libraries
 .    if empty(gcc44_GCC_ARCHDIR:M*not_found*)
@@ -37,13 +40,13 @@
 #.      endif
 
 # add the header files
-BUILDLINK_INCDIRS.gcc44+=      include ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/include
+BUILDLINK_INCDIRS.gcc44+=      ${_GCC44_SUBDIR}/include ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/include
 .    endif
 .  endif
 
 BUILDLINK_FILES_CMD.gcc44=     \
        (cd  ${BUILDLINK_PREFIX.gcc44} &&       \
-       ${FIND} bin libexec lib \( -type f -o -type l \) -print)
+       ${FIND} ${_GCC44_SUBDIR}/bin ${_GCC44_SUBDIR}/libexec ${_GCC44_SUBDIR}/lib \( -type f -o -type l \) -print)
 BUILDLINK_FNAME_TRANSFORM.gcc44=       -e s:buildlink:buildlink/gcc44:
 
 # Packages that link against shared libraries need a full dependency.