xcb-proto: update based on changes to python.m4 in automake
1. We dont need the aclocal patch as this will be handled by automake 2. We need to update xcb-proto.pc.in to know about ${libdir} since we'll end up with something like: pythondir=${libdir}/python2.6/site-packages (From OE-Core rev: 4de2ba0eeaefbd6813443c6906108b815af9e109) Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7449a372eb
commit
86504a12ad
|
@ -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'`
|
|
@ -0,0 +1,14 @@
|
|||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
|
||||
|
||||
Index: xcb-proto-1.6/xcb-proto.pc.in
|
||||
===================================================================
|
||||
--- xcb-proto-1.6.orig/xcb-proto.pc.in
|
||||
+++ xcb-proto-1.6/xcb-proto.pc.in
|
||||
@@ -1,4 +1,5 @@
|
||||
prefix=@prefix@
|
||||
+libdir=@libdir@
|
||||
datarootdir=@datarootdir@
|
||||
datadir=@datadir@
|
||||
xcbincludedir=@xcbincludedir@
|
|
@ -10,7 +10,7 @@ SECTION = "x11/libs"
|
|||
LICENSE = "MIT-X"
|
||||
|
||||
SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
|
||||
file://aclocal.patch"
|
||||
file://xcb-proto-libdir.patch"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue