diff options
author | drochner <drochner> | 2014-02-12 18:11:27 +0000 |
---|---|---|
committer | drochner <drochner> | 2014-02-12 18:11:27 +0000 |
commit | 5a2179d5fbd3c5328748740c92f4102ca72d46f3 (patch) | |
tree | fd7814a4a8360073f34819a3ba73ae39ac4bbebd /devel | |
parent | 81e1b3ecd19ca49ed7eb70382772dea749163299 (diff) | |
download | pkgsrc-5a2179d5fbd3c5328748740c92f4102ca72d46f3.tar.gz |
-move PYTHON_VERSIONS_INCOMPATIBLE before first use of "pyversion.mk",
otherwise it has no effect
-in buildlink3.mk, also add PYTHON_VERSIONS_INCOMPATIBLE to avoid
picking up the default Python version (XXX we need a way to express
major version restrictions, otherwise this doesn't scale)
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libpeas/Makefile | 6 | ||||
-rw-r--r-- | devel/libpeas/buildlink3.mk | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile index 79ca0381f98..80db8d10f64 100644 --- a/devel/libpeas/Makefile +++ b/devel/libpeas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/02/12 01:35:43 prlw1 Exp $ +# $NetBSD: Makefile,v 1.19 2014/02/12 18:11:27 drochner Exp $ # DISTNAME= libpeas-1.8.1 @@ -17,12 +17,12 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake intltool msgfmt pkg-config gsed +PYTHON_VERSIONS_INCOMPATIBLE= 26 27 + .include "../../lang/python/pyversion.mk" CONFIGURE_ARGS+= --disable-python2 CONFIGURE_ENV+= PYTHON3_CONFIG=/usr/pkg/bin/python${PYVERSSUFFIX}-config -PYTHON_VERSIONS_INCOMPATIBLE= 26 27 - PKGCONFIG_OVERRIDE+= data/libpeas-gtk-1.0.pc.in PKGCONFIG_OVERRIDE+= data/libpeas-1.0.pc.in diff --git a/devel/libpeas/buildlink3.mk b/devel/libpeas/buildlink3.mk index b2751500069..ae846f63389 100644 --- a/devel/libpeas/buildlink3.mk +++ b/devel/libpeas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2013/10/10 14:41:56 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2014/02/12 18:11:27 drochner Exp $ BUILDLINK_TREE+= libpeas @@ -11,6 +11,7 @@ BUILDLINK_PKGSRCDIR.libpeas?= ../../devel/libpeas .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" +PYTHON_VERSIONS_INCOMPATIBLE+= 26 27 .include "../../devel/py-gobject3/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" .endif # LIBPEAS_BUILDLINK3_MK |