diff options
| author | dmcmahill <dmcmahill> | 2009-09-18 13:35:41 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2009-09-18 13:35:41 +0000 |
| commit | 62f24522e09fba3b2950455abae704fa15bb6895 (patch) | |
| tree | f6774bc02e58544ba19e495db9710cee9924697c /lang/gcc44 | |
| parent | 80f28877cd91ca404c01275f73a60bffc4a4b511 (diff) | |
| download | pkgsrc-62f24522e09fba3b2950455abae704fa15bb6895.tar.gz | |
Fix some path issues which caused buildlink of all libs and headers in /usr/pkg.
Diffstat (limited to 'lang/gcc44')
| -rw-r--r-- | lang/gcc44/buildlink3.mk | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lang/gcc44/buildlink3.mk b/lang/gcc44/buildlink3.mk index b2f9cf02c0e..69f6b025719 100644 --- a/lang/gcc44/buildlink3.mk +++ b/lang/gcc44/buildlink3.mk @@ -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 @@ GCC44_BUILDLINK3_MK:= 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 @@ BUILDLINK_LIBDIRS.gcc44+= ${gcc44_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc44}\///}/ #. 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. |