pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Store the actual library options in BUILDLINK_LDADD...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/61bf9e96365c
branches:  trunk
changeset: 483601:61bf9e96365c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 15 18:01:58 2004 +0000

description:
Store the actual library options in BUILDLINK_LDADD.db1 and append that
to BUILDLINK_LIBS.db1.  This ensures that BUILDLINK_LDADD.${BDB_TYPE}
always resolves to the correct library options.

diffstat:

 mk/db1.builtin.mk |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 8f9ea4d69cdb -r 61bf9e96365c mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Mon Nov 15 17:54:49 2004 +0000
+++ b/mk/db1.builtin.mk Mon Nov 15 18:01:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.1 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: db1.builtin.mk,v 1.2 2004/11/15 18:01:58 jlam Exp $
 
 .for _lib_ in db db1
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -62,11 +62,12 @@
 BUILDLINK_INCDIRS.db1=         include/db1
 .    endif
 .    if !empty(_BLNK_LIB_FOUND.db:M[yY][eE][sS])
-BUILDLINK_LIBS.db1=            -ldb
+BUILDLINK_LDADD.db1=           -ldb
 .    endif
 .    if !empty(_BLNK_LIB_FOUND.db1:M[yY][eE][sS])
-BUILDLINK_LIBS.db1=            -ldb1
+BUILDLINK_LDADD.db1=           -ldb1
 BUILDLINK_TRANSFORM+=          l:db:db1
 .    endif
+BUILDLINK_LIBS.db1=            ${BUILDLINK_LDADD.db1}
 .  endif # USE_BUILTIN.db1 == yes
 .endif # CHECK_BUILTIN.db1



Home | Main Index | Thread Index | Old Index