diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2012-12-04 14:54:34 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2012-12-04 14:54:34 +0000 |
| commit | ea997f4991f72adee021f00b34357236983cfeb2 (patch) | |
| tree | 565f8e20de203f22454dd797247abd0591836a4f /devel | |
| parent | 12b36b782bfab9f881b9a283c17f582c0d5fc8c5 (diff) | |
| download | pkgsrc-ea997f4991f72adee021f00b34357236983cfeb2.tar.gz | |
Fix solaris build from Richard Palo in PR47275.
Although neither our egg.mk nor distutils.mk files use PLATFORM in
EGG_NAME, egg{,-info} filenames are of the form
name ["-" version ["-py" pyver ["-" required_platform]]] "." ext
As pygobject is C based, they chose to include required_platform in the
egg name. As per the patch, PLATFORM is the output of python's
get_platform() function, which is not just uname() output, but a
modified version of it on solaris. (Stricly, get_build_platform() might
be even more correct, but would require a depency on setuputils.)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/py-gobject3/Makefile | 11 | ||||
| -rw-r--r-- | devel/py-gobject3/PLIST | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile index e598b42027c..27f017c0062 100644 --- a/devel/py-gobject3/Makefile +++ b/devel/py-gobject3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/26 10:18:42 prlw1 Exp $ +# $NetBSD: Makefile,v 1.10 2012/12/04 14:54:34 prlw1 Exp $ # DISTNAME= pygobject-3.4.1.1 @@ -32,12 +32,13 @@ REPLACE_PYTHON+= docs/xsl/fixxref.py.in .include "../../graphics/cairo-gobject/buildlink3.mk" TEST_TARGET= check -# for the egg -UNAME_M!= uname -m -PLIST_SUBST+= UNAME_M=${UNAME_M:Q} - .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" + +# for the egg +PLATFORM!= ${PYTHONBIN:Q} -c "import sys; from distutils import util; sys.stdout.write(util.get_platform())" +PLIST_SUBST+= PLATFORM=${PLATFORM:Q} + .include "../../graphics/py-cairo/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.gobject-introspection= gobject-introspection>=1.34.1.1 diff --git a/devel/py-gobject3/PLIST b/devel/py-gobject3/PLIST index 6ad8dadf4d1..e8955502f6c 100644 --- a/devel/py-gobject3/PLIST +++ b/devel/py-gobject3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2012/10/26 10:18:42 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.4 2012/12/04 14:54:34 prlw1 Exp $ include/pygobject-3.0/pygobject.h lib/libpyglib-gi-2.0-python${PYVERSSUFFIX}.la lib/pkgconfig/pygobject-3.0.pc @@ -66,4 +66,4 @@ ${PYSITELIB}/gi/repository/__init__.pyo ${PYSITELIB}/gi/types.py ${PYSITELIB}/gi/types.pyc ${PYSITELIB}/gi/types.pyo -${PYSITELIB}/pygobject-3.4.1.1-py${PYVERSSUFFIX}-${LOWER_OPSYS}-${OS_VERSION}-${UNAME_M}.egg-info +${PYSITELIB}/pygobject-${PKGVERSION}-py${PYVERSSUFFIX}-${PLATFORM}.egg-info |