diff options
| author | ryoon <ryoon> | 2014-01-29 13:01:53 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2014-01-29 13:01:53 +0000 |
| commit | beadf3d464f7736530529b916dea7896a007c95e (patch) | |
| tree | 7ab0f3643d78cc3f1f19b68df7b1d4c219e50465 | |
| parent | 8a2b482d2aedafa3bc917c6519e4ad8ce71945f6 (diff) | |
| download | pkgsrc-beadf3d464f7736530529b916dea7896a007c95e.tar.gz | |
Restrict lib/dbus-1.0/include/dbus/dbus-arch-deps.h buildlink
Avoid errors in non-qt5-dbus packages.
| -rw-r--r-- | sysutils/dbus/buildlink3.mk | 6 | ||||
| -rw-r--r-- | x11/qt5-dbus/Makefile | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk index 1fabf24d4a4..758438963c0 100644 --- a/sysutils/dbus/buildlink3.mk +++ b/sysutils/dbus/buildlink3.mk @@ -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 @@ DBUS_BUILDLINK3_MK:= 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 --git a/x11/qt5-dbus/Makefile b/x11/qt5-dbus/Makefile index 2558d53822c..a5a2f9716a8 100644 --- a/x11/qt5-dbus/Makefile +++ b/x11/qt5-dbus/Makefile @@ -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 @@ post-install: .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" |