Tue Feb 19 11:12:51 2008 UTC ()
Check if BUILDLINK_AUTO_VARS.${_pkg_} is defined before testing it
via !empty. This fixes a problem with gnome-panel and db1.


(xtraeme)
diff -r1.200 -r1.201 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs diff -r1.200 -r1.201 pkgsrc/mk/buildlink3/bsd.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2008/02/07 21:36:13 1.200
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2008/02/19 11:12:51 1.201
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.buildlink3.mk,v 1.200 2008/02/07 21:36:13 rillig Exp $ 1# $NetBSD: bsd.buildlink3.mk,v 1.201 2008/02/19 11:12:51 xtraeme Exp $
2# 2#
3# Copyright (c) 2004 The NetBSD Foundation, Inc. 3# Copyright (c) 2004 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -344,27 +344,28 @@ BUILDLINK_RPATHDIRS.${_pkg_}?= # empty @@ -344,27 +344,28 @@ BUILDLINK_RPATHDIRS.${_pkg_}?= # empty
344 344
345# BUILDLINK_CPPFLAGS, BUILDLINK_LDFLAGS, and BUILDLINK_LIBS contain the 345# BUILDLINK_CPPFLAGS, BUILDLINK_LDFLAGS, and BUILDLINK_LIBS contain the
346# proper -I..., -L.../-Wl,-R..., and -l... options to be passed to the 346# proper -I..., -L.../-Wl,-R..., and -l... options to be passed to the
347# compiler and linker to find the headers and libraries for the various 347# compiler and linker to find the headers and libraries for the various
348# packages at configure/build time. BUILDLINK_CFLAGS contains any special 348# packages at configure/build time. BUILDLINK_CFLAGS contains any special
349# compiler options needed when building against the various packages. 349# compiler options needed when building against the various packages.
350# 350#
351BUILDLINK_CPPFLAGS= # empty 351BUILDLINK_CPPFLAGS= # empty
352BUILDLINK_LDFLAGS= # empty 352BUILDLINK_LDFLAGS= # empty
353BUILDLINK_LIBS= # empty 353BUILDLINK_LIBS= # empty
354BUILDLINK_CFLAGS= # empty 354BUILDLINK_CFLAGS= # empty
355 355
356.for _pkg_ in ${_BLNK_PACKAGES} 356.for _pkg_ in ${_BLNK_PACKAGES}
357. if !empty(BUILDLINK_AUTO_VARS.${_pkg_}:M[yY][eE][sS]) 357. if defined(BUILDLINK_AUTO_VARS.${_pkg_}) && \
 358 !empty(BUILDLINK_AUTO_VARS.${_pkg_}:M[yY][eE][sS])
358. for _flag_ in ${BUILDLINK_CPPFLAGS.${_pkg_}} 359. for _flag_ in ${BUILDLINK_CPPFLAGS.${_pkg_}}
359. if empty(BUILDLINK_CPPFLAGS:M${_flag_:S/:/\\:/g}) 360. if empty(BUILDLINK_CPPFLAGS:M${_flag_:S/:/\\:/g})
360BUILDLINK_CPPFLAGS+= ${_flag_} 361BUILDLINK_CPPFLAGS+= ${_flag_}
361. endif 362. endif
362. endfor 363. endfor
363. for _flag_ in ${BUILDLINK_LDFLAGS.${_pkg_}} 364. for _flag_ in ${BUILDLINK_LDFLAGS.${_pkg_}}
364. if empty(BUILDLINK_LDFLAGS:M${_flag_:S/:/\\:/g}) 365. if empty(BUILDLINK_LDFLAGS:M${_flag_:S/:/\\:/g})
365BUILDLINK_LDFLAGS+= ${_flag_} 366BUILDLINK_LDFLAGS+= ${_flag_}
366. endif 367. endif
367. endfor 368. endfor
368. for _flag_ in ${BUILDLINK_CFLAGS.${_pkg_}} 369. for _flag_ in ${BUILDLINK_CFLAGS.${_pkg_}}
369. if empty(BUILDLINK_CFLAGS:M${_flag_:S/:/\\:/g}) 370. if empty(BUILDLINK_CFLAGS:M${_flag_:S/:/\\:/g})
370BUILDLINK_CFLAGS+= ${_flag_} 371BUILDLINK_CFLAGS+= ${_flag_}