* [PATCH 0/4] python libdir / site-packages path cleanup @ 2011-08-09 18:36 Kumar Gala 2011-08-09 18:36 ` [PATCH 1/4] python-dir: specify am_cv_python_pythondir & am_cv_python_pyexecdir Kumar Gala 0 siblings, 1 reply; 5+ messages in thread From: Kumar Gala @ 2011-08-09 18:36 UTC (permalink / raw) To: openembedded-core Utilize python-dir setting of am_cv_python_pythondir & am_cv_python_pyexecdir to proper paths to handle different libdir and multilib cases. - k ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] python-dir: specify am_cv_python_pythondir & am_cv_python_pyexecdir 2011-08-09 18:36 [PATCH 0/4] python libdir / site-packages path cleanup Kumar Gala @ 2011-08-09 18:36 ` Kumar Gala 2011-08-09 18:36 ` [PATCH 2/4] xcb-proto: use python-dir class for proper path setting Kumar Gala 0 siblings, 1 reply; 5+ messages in thread From: Kumar Gala @ 2011-08-09 18:36 UTC (permalink / raw) To: openembedded-core autoconf will try and set these to via python.m4: am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages However this is problematic as this doesnt respect libdir and where we've actually set python's site package dir to. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/classes/python-dir.bbclass | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass index 1ceb929..526b3bf 100644 --- a/meta/classes/python-dir.bbclass +++ b/meta/classes/python-dir.bbclass @@ -1,3 +1,6 @@ PYTHON_BASEVERSION ?= "2.6" PYTHON_DIR = "python${PYTHON_BASEVERSION}" PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages" + +EXTRA_OECONF += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}" +EXTRA_OECONF += "am_cv_python_pyexecdir=${PYTHON_SITEPACKAGES_DIR}" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] xcb-proto: use python-dir class for proper path setting 2011-08-09 18:36 ` [PATCH 1/4] python-dir: specify am_cv_python_pythondir & am_cv_python_pyexecdir Kumar Gala @ 2011-08-09 18:36 ` Kumar Gala 2011-08-09 18:36 ` [PATCH 3/4] telepathy-python: utilize python-dir to respect libdir/site-packages path Kumar Gala 0 siblings, 1 reply; 5+ messages in thread From: Kumar Gala @ 2011-08-09 18:36 UTC (permalink / raw) To: openembedded-core The previous patch to deal with multilib that patched aclocal doesn't work in all cases as we might regenerate aclocal and thus the modification is overwritten. Instead we can utilize python-dir class to have it set: am_cv_python_pythondir & am_cv_python_pyexecdir for is to the proper path. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- .../xcb/xcb-proto-1.6/aclocal.patch | 22 -------------------- meta/recipes-graphics/xcb/xcb-proto.inc | 5 +-- meta/recipes-graphics/xcb/xcb-proto_1.6.bb | 2 +- meta/recipes-graphics/xcb/xcb-proto_git.bb | 2 +- 4 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch diff --git a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch deleted file mode 100644 index 124f146..0000000 --- a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -ruN xcb-proto-1.6-orig/aclocal.m4 xcb-proto-1.6/aclocal.m4 ---- xcb-proto-1.6-orig/aclocal.m4 2011-07-08 15:45:33.000000000 +0800 -+++ xcb-proto-1.6/aclocal.m4 2011-07-08 15:48:19.000000000 +0800 -@@ -518,6 +518,7 @@ - dnl general consensus is that you shouldn't need this ability. - - AC_SUBST([PYTHON_PREFIX], ['${prefix}']) -+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) - - dnl At times (like when building shared libraries) you may want -@@ -546,7 +547,7 @@ - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || -- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc index 76688c9..048a8e2 100644 --- a/meta/recipes-graphics/xcb/xcb-proto.inc +++ b/meta/recipes-graphics/xcb/xcb-proto.inc @@ -9,10 +9,9 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" SECTION = "x11/libs" LICENSE = "MIT-X" -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ - file://aclocal.patch" +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" -inherit autotools pkgconfig +inherit autotools pkgconfig python-dir PACKAGES += "python-xcbgen" diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb index 1868f1a..9d35596 100644 --- a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb +++ b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" -PR = "r2" +PR = "r3" SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b" SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2" diff --git a/meta/recipes-graphics/xcb/xcb-proto_git.bb b/meta/recipes-graphics/xcb/xcb-proto_git.bb index 2711213..4358fee 100644 --- a/meta/recipes-graphics/xcb/xcb-proto_git.bb +++ b/meta/recipes-graphics/xcb/xcb-proto_git.bb @@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1" include xcb-proto.inc SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66" PV = "1.2+gitr${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git" S = "${WORKDIR}/git" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] telepathy-python: utilize python-dir to respect libdir/site-packages path 2011-08-09 18:36 ` [PATCH 2/4] xcb-proto: use python-dir class for proper path setting Kumar Gala @ 2011-08-09 18:36 ` Kumar Gala 2011-08-09 18:36 ` [PATCH 4/4] gnome-doc-utils: respect python-dir setting EXTRA_OECONF Kumar Gala 0 siblings, 1 reply; 5+ messages in thread From: Kumar Gala @ 2011-08-09 18:36 UTC (permalink / raw) To: openembedded-core Fixes issue of libdir is set to something like '/usr/lib64'. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- .../telepathy/telepathy-python_0.15.19.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb index ead8dea..fde4006 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb @@ -9,9 +9,9 @@ RDEPENDS_${PN} += "python-dbus" SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://parallel_make.patch" -PR = "r2" +PR = "r3" -inherit autotools +inherit autotools python-dir SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017" SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] gnome-doc-utils: respect python-dir setting EXTRA_OECONF 2011-08-09 18:36 ` [PATCH 3/4] telepathy-python: utilize python-dir to respect libdir/site-packages path Kumar Gala @ 2011-08-09 18:36 ` Kumar Gala 0 siblings, 0 replies; 5+ messages in thread From: Kumar Gala @ 2011-08-09 18:36 UTC (permalink / raw) To: openembedded-core Don't just assign but append to EXTRA_OECONF so we maintain python-dir setting fo EXTRA_OECONF. This fixes issue if libdir is set to something like '/usr/lib64'. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/recipes-gnome/gnome/gnome-doc-utils.inc | 2 +- meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc index bd7c615..b92b565 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc +++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc @@ -4,7 +4,7 @@ DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native" inherit gnome gettext python-dir -EXTRA_OECONF = "--disable-scrollkeeper" +EXTRA_OECONF += "--disable-scrollkeeper" do_install_append() { mkdir -p ${D}${datadir}/xml/gnome/xslt/ diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb index 1ec1076..c65cf64 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb +++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb @@ -1,7 +1,7 @@ require gnome-doc-utils.inc LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343" -PR = "r4" +PR = "r5" SRC_URI += "file://xsltproc_nonet.patch \ file://use-usr-bin-env-for-python-in-xml2po.patch" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-08-09 18:41 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-08-09 18:36 [PATCH 0/4] python libdir / site-packages path cleanup Kumar Gala 2011-08-09 18:36 ` [PATCH 1/4] python-dir: specify am_cv_python_pythondir & am_cv_python_pyexecdir Kumar Gala 2011-08-09 18:36 ` [PATCH 2/4] xcb-proto: use python-dir class for proper path setting Kumar Gala 2011-08-09 18:36 ` [PATCH 3/4] telepathy-python: utilize python-dir to respect libdir/site-packages path Kumar Gala 2011-08-09 18:36 ` [PATCH 4/4] gnome-doc-utils: respect python-dir setting EXTRA_OECONF Kumar Gala
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox