pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases Use BUILDLINK_{INCDIRS,LIBDIRS}.<pkg> instea...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/722d461209e4
branches:  trunk
changeset: 465697:722d461209e4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 04 23:46:39 2004 +0000

description:
Use BUILDLINK_{INCDIRS,LIBDIRS}.<pkg> instead of
BUILDLINK_{CPPFLAGS,LDFLAGS}.<pkg> where we're adding search directories.
Using the former should do the right thing for pkgviews if we do binary
package upgrades of dependencies by inserting the right default view
directories into the search path as well.

diffstat:

 databases/db4/buildlink3.mk          |  4 ++--
 databases/mysql-client/buildlink3.mk |  6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 6bcd844b0eb0 -r 722d461209e4 databases/db4/buildlink3.mk
--- a/databases/db4/buildlink3.mk       Sun Jan 04 23:34:04 2004 +0000
+++ b/databases/db4/buildlink3.mk       Sun Jan 04 23:46:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/04 23:46:39 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=    ${DB4_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=           db4
 BUILDLINK_DEPENDS.db4?=                db4>=4.1.25
 BUILDLINK_PKGSRCDIR.db4?=      ../../databases/db4
-BUILDLINK_CPPFLAGS.db4?=       -I${BUILDLINK_PREFIX.db4}/include/db4
+BUILDLINK_INCDIRS.db4?=                include/db4
 .endif # DB4_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:C/\+$//}
diff -r 6bcd844b0eb0 -r 722d461209e4 databases/mysql-client/buildlink3.mk
--- a/databases/mysql-client/buildlink3.mk      Sun Jan 04 23:34:04 2004 +0000
+++ b/databases/mysql-client/buildlink3.mk      Sun Jan 04 23:46:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/04 23:46:39 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=   ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,9 +11,7 @@
 BUILDLINK_PACKAGES+=                   mysql-client
 BUILDLINK_DEPENDS.mysql-client?=       mysql-client>=3.23.58
 BUILDLINK_PKGSRCDIR.mysql-client?=     ../../databases/mysql-client
-BUILDLINK_LDFLAGS.mysql-client?=       \
-       -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql                    \
-       -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+BUILDLINK_LIBDIRS.mysql-client?=       lib/mysql
 
 .  include "../../devel/zlib/buildlink3.mk"
 .endif # MYSQL_CLIENT_BUILDLINK3_MK



Home | Main Index | Thread Index | Old Index