diff options
| author | jperkin <jperkin> | 2017-06-29 11:10:18 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-06-29 11:10:18 +0000 |
| commit | 9d768681119b13cdd21ef4e3adae74e8aea1646d (patch) | |
| tree | d016d8bbc3c434ecfbca7124a734e3fcf4170955 | |
| parent | eb2c6ec7337ccbf48b46fe75e69793cd427d1f47 (diff) | |
| download | pkgsrc-9d768681119b13cdd21ef4e3adae74e8aea1646d.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.
| -rw-r--r-- | editors/pluma/Makefile | 8 | ||||
| -rw-r--r-- | graphics/eom/Makefile | 8 |
2 files changed, 12 insertions, 4 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" diff --git a/graphics/eom/Makefile b/graphics/eom/Makefile index 1ab56e4cffc..3eb5bb9ef19 100644 --- a/graphics/eom/Makefile +++ b/graphics/eom/Makefile @@ -1,5 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2017/06/23 17:10:44 youri Exp $ +# $NetBSD: Makefile,v 1.7 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= eom-${VERSION:R}.2 @@ -17,7 +22,6 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-lutil .include "../../x11/mate-desktop/buildlink3.mk" .include "../../databases/shared-mime-info/buildlink3.mk" -.include "../../devel/libpeas/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" |