pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Restrict lib/dbus-1.0/include/dbus/dbus-arch-deps.h bu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/71f4d145c4b9
branches: trunk
changeset: 629857:71f4d145c4b9
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Wed Jan 29 13:01:53 2014 +0000
description:
Restrict lib/dbus-1.0/include/dbus/dbus-arch-deps.h buildlink
Avoid errors in non-qt5-dbus packages.
diffstat:
sysutils/dbus/buildlink3.mk | 6 +++++-
x11/qt5-dbus/Makefile | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diffs (40 lines):
diff -r 77e93d2a612f -r 71f4d145c4b9 sysutils/dbus/buildlink3.mk
--- a/sysutils/dbus/buildlink3.mk Wed Jan 29 09:51:19 2014 +0000
+++ b/sysutils/dbus/buildlink3.mk Wed Jan 29 13:01:53 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2013/12/13 14:51:23 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2014/01/29 13:01:53 ryoon Exp $
BUILDLINK_TREE+= dbus
@@ -8,8 +8,12 @@
BUILDLINK_API_DEPENDS.dbus+= dbus>=0.91
BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus
+.if defined(USE_DBUS-ARCH-DEPS_H)
+. if !empty(USE_DBUS-ARCH-DEPS_H:M[yY][eE][sS])
BUILDLINK_INCDIRS.dbus+= lib/dbus-1.0/include/dbus
BUILDLINK_FNAME_TRANSFORM.dbus+= -e "s|lib/dbus-1.0/||"
+. endif
+.endif
.include "../../textproc/expat/buildlink3.mk"
.endif # DBUS_BUILDLINK3_MK
diff -r 77e93d2a612f -r 71f4d145c4b9 x11/qt5-dbus/Makefile
--- a/x11/qt5-dbus/Makefile Wed Jan 29 09:51:19 2014 +0000
+++ b/x11/qt5-dbus/Makefile Wed Jan 29 13:01:53 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/01/04 11:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/29 13:01:53 ryoon Exp $
PKGNAME= qt5-dbus-${QTVERSION}
PKGREVISION= 1
@@ -26,6 +26,8 @@
.endfor
.include "../../devel/gettext-lib/buildlink3.mk"
+# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
+USE_DBUS-ARCH-DEPS_H= yes
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index