diff options
| author | jperkin <jperkin@pkgsrc.org> | 2017-06-29 11:10:18 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2017-06-29 11:10:18 +0000 |
| commit | 122e6e0c28dd914b723cc4524a28d8260721f5a9 (patch) | |
| tree | d016d8bbc3c434ecfbca7124a734e3fcf4170955 /editors | |
| parent | bdbe27a712450cbb5bbb62e919725f4300072e8b (diff) | |
| download | pkgsrc-122e6e0c28dd914b723cc4524a28d8260721f5a9.tar.gz | |
Work around include ordering issues with meta-pkgs/mate/Makefile.common
to ensure a valid python is chosen. This should be fixed properly after
the branch.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/pluma/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile index 3e23e33bac4..808822618f2 100644 --- a/editors/pluma/Makefile +++ b/editors/pluma/Makefile @@ -1,5 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2017/06/23 17:32:16 youri Exp $ +# $NetBSD: Makefile,v 1.6 2017/06/29 11:10:18 jperkin Exp $ +# XXX: meta-pkgs/mate/Makefile.common includes pyversion.mk which sets the +# python version too early and clashes with PYTHON_VERSIONS_INCOMPATIBLE +# from libpeas bl3, so we include it early to ensure a valid version is +# chosen. This is not ideal, please fix it properly at some point. +.include "../../devel/libpeas/buildlink3.mk" .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= pluma-${VERSION:R}.2 @@ -18,7 +23,6 @@ CONFIGURE_ARGS+= --disable-updater # only for OS X and Windows .include "../../devel/glib2/schemas.mk" -.include "../../devel/libpeas/buildlink3.mk" .include "../../x11/mate-desktop/buildlink3.mk" .include "../../x11/gtksourceview3/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" |