diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-09-22 14:46:13 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-09-22 14:46:13 +0000 |
| commit | 8321809b1f22e0febe54306563d10f77abca4013 (patch) | |
| tree | 34f9b822ce8359d72c4a1fabf65740fc0a21a4ef /meta/packages/xorg-lib | |
| parent | 565180719bbf2fd78334a357b8d8760a6156cac3 (diff) | |
| download | openembedded-core-8321809b1f22e0febe54306563d10f77abca4013.tar.gz openembedded-core-8321809b1f22e0febe54306563d10f77abca4013.tar.bz2 openembedded-core-8321809b1f22e0febe54306563d10f77abca4013.tar.xz openembedded-core-8321809b1f22e0febe54306563d10f77abca4013.zip | |
libx11-trim: fix location on keysymdef.h
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5214 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib')
| -rw-r--r-- | meta/packages/xorg-lib/libx11-trim/include_fix.patch | 23 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11-trim_1.1.5.bb | 5 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/packages/xorg-lib/libx11-trim/include_fix.patch b/meta/packages/xorg-lib/libx11-trim/include_fix.patch new file mode 100644 index 000000000..99ed57194 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-trim/include_fix.patch @@ -0,0 +1,23 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libX11-1.1.5.orig/configure.ac ++++ libX11-1.1.5/configure.ac +@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + + # + # Find keysymdef.h + # +-AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi diff --git a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb index 659b7ba5b..77f0d2834 100644 --- a/meta/packages/xorg-lib/libx11-trim_1.1.5.bb +++ b/meta/packages/xorg-lib/libx11-trim_1.1.5.bb @@ -9,11 +9,14 @@ DEPENDS += "libxcb xproto xextproto xtrans libxau" PROVIDES = "virtual/libx11" PE = "1" -PR = "r0" +PR = "r1" XORG_PN = "libX11" LEAD_SONAME = "libX11.so" +SRC_URI += "file://include_fix.patch;patch=1" + +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" #EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb" EXTRA_OECONF += "--disable-xcms --with-xcb" |