pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Check if BUILDLINK_AUTO_VARS.${_pkg_} is...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b2fe07a754f
branches:  trunk
changeset: 538774:2b2fe07a754f
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Feb 19 11:12:51 2008 +0000

description:
Check if BUILDLINK_AUTO_VARS.${_pkg_} is defined before testing it
via !empty. This fixes a problem with gnome-panel and db1.

diffstat:

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

diffs (19 lines):

diff -r 203948e2d7df -r 2b2fe07a754f mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Tue Feb 19 10:35:15 2008 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Tue Feb 19 11:12:51 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.200 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.201 2008/02/19 11:12:51 xtraeme Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -354,7 +354,8 @@
 BUILDLINK_CFLAGS=      # empty
 
 .for _pkg_ in ${_BLNK_PACKAGES}
-.  if !empty(BUILDLINK_AUTO_VARS.${_pkg_}:M[yY][eE][sS])
+.  if defined(BUILDLINK_AUTO_VARS.${_pkg_}) && \
+      !empty(BUILDLINK_AUTO_VARS.${_pkg_}:M[yY][eE][sS])
 .    for _flag_ in ${BUILDLINK_CPPFLAGS.${_pkg_}}
 .      if empty(BUILDLINK_CPPFLAGS:M${_flag_:S/:/\\:/g})
 BUILDLINK_CPPFLAGS+=   ${_flag_}



Home | Main Index | Thread Index | Old Index