diff options
| author |   Kumar Gala <galak@kernel.crashing.org> | 2011-08-11 01:26:34 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-12 17:11:24 +0100 |
| commit | 4de2ba0eeaefbd6813443c6906108b815af9e109 (patch) | |
| tree | c420a42a79b180f2fb5f2e4611f21e09beb461df /meta/recipes-graphics/xcb/xcb-proto-1.6 | |
| parent | d300cfe603b00fc963f7ed874563016fcbcc47a8 (diff) | |
| download | openembedded-core-contrib-4de2ba0eeaefbd6813443c6906108b815af9e109.tar.gz | |
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
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'meta/recipes-graphics/xcb/xcb-proto-1.6')
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch | 14 |
2 files changed, 14 insertions, 22 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 deleted file mode 100644 index 124f146345..0000000000 --- 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-1.6/xcb-proto-libdir.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch new file mode 100644 index 0000000000..708f329590 --- /dev/null +++ b/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch @@ -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@ |