diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2011-07-13 16:43:44 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-20 15:24:55 +0100 |
| commit | ec7ea43749d40e4164dc35493a796b9546e60e4e (patch) | |
| tree | 707fc594cec00a1a0b7c82429b35ef08a8c91a6a /meta/recipes-graphics/xcb | |
| parent | 02c843d995e238f7a5b326195f14222f6a99b596 (diff) | |
| download | openembedded-core-ec7ea43749d40e4164dc35493a796b9546e60e4e.tar.gz | |
xcb-proto: add multilib support.
There is hardcode of /usr/lib dir for some python files.
Fix it to support multilib.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xcb')
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto_1.6.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto_git.bb | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch new file mode 100644 index 0000000000..124f146345 --- /dev/null +++ b/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch @@ -0,0 +1,22 @@ +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 cd7e115174..76688c9ebc 100644 --- a/meta/recipes-graphics/xcb/xcb-proto.inc +++ b/meta/recipes-graphics/xcb/xcb-proto.inc @@ -9,7 +9,8 @@ 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" +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ + file://aclocal.patch" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb index 3133977678..1868f1aa86 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 = "r1" +PR = "r2" 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 01a7d912f7..27112137d0 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 = "r1" +PR = "r2" SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git" S = "${WORKDIR}/git" |