pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Fix code that assumed that BUILDLINK_DEP...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/72337d91f2ae
branches:  trunk
changeset: 466997:72337d91f2ae
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 25 12:43:24 2004 +0000

description:
Fix code that assumed that BUILDLINK_DEPENDS.<pkg> was a unique value by
modifying it to accept a list.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r cda7a8df2e3f -r 72337d91f2ae mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Sun Jan 25 12:04:37 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Sun Jan 25 12:43:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.54 2004/01/21 18:18:13 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.55 2004/01/25 12:43:24 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -202,10 +202,13 @@
 # containing the package metadata.
 #
 .  if !defined(_BLNK_PKG_DBDIR.${_pkg_})
+_BLNK_PKG_DBDIR.${_pkg_}?=     # empty
+.    for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}}
+.      if empty(BUILDLINK_DEPENDS.${_pkg_}:Mnot_found)
 _BLNK_PKG_DBDIR.${_pkg_}!=     \
        dir="";                                                         \
        if [ -d ${_PKG_DBDIR} ]; then                                   \
-               dir=`cd ${_PKG_DBDIR}; ${PKG_ADMIN} -s "" lsbest "${BUILDLINK_DEPENDS.${_pkg_}}" || ${TRUE}`; \
+               dir=`cd ${_PKG_DBDIR}; ${PKG_ADMIN} -s "" lsbest "${_depend_}" || ${TRUE}`; \
        fi;                                                             \
        case "$$dir" in                                                 \
        "")     dir="not_found" ;;                                      \
@@ -214,6 +217,8 @@
                fi ;;                                                   \
        esac;                                                           \
        ${ECHO} $$dir
+.      endif
+.    endfor
 .    if empty(_BLNK_PKG_DBDIR.${_pkg_}:Mnot_found)
 MAKEFLAGS+=    _BLNK_PKG_DBDIR.${_pkg_}=${_BLNK_PKG_DBDIR.${_pkg_}}
 .    endif



Home | Main Index | Thread Index | Old Index