pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/misc/rpm Add an hack to get this building on platforms...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a7021e954aa
branches:  trunk
changeset: 399537:9a7021e954aa
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Tue Sep 22 08:37:15 2009 +0000

description:
Add an hack to get this building on platforms with USE_DB185.

diffstat:

 misc/rpm/Makefile |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 0152a04a746d -r 9a7021e954aa misc/rpm/Makefile
--- a/misc/rpm/Makefile Tue Sep 22 07:57:33 2009 +0000
+++ b/misc/rpm/Makefile Tue Sep 22 08:37:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2008/01/12 23:43:53 heinz Exp $
+# $NetBSD: Makefile,v 1.67 2009/09/22 08:37:15 sketch Exp $
 
 DISTNAME=      rpm-2.5.4
 PKGREVISION=   6
@@ -33,6 +33,13 @@
 RPMDIR=                        ${RPM_DB_PREFIX}/lib/rpm
 FILES_SUBST+=          RPMDIR=${RPMDIR:Q}
 
+.include "../../mk/bdb.buildlink3.mk"
+
+# Ugly hack, but easier than fixing our bdb handling / rpm configure for now
+.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
+LDFLAGS+=              -ldb
+.endif
+
 .include "../../mk/bsd.prefs.mk"
 
 post-configure:
@@ -55,5 +62,4 @@
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index