diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-01-02 15:15:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-01-02 15:15:36 +0000 |
| commit | f8b1fd4926f7dcba35d4e074225ba186b25e8f0d (patch) | |
| tree | 3e3a89a2e36deefed898bd2afd831f472c8c7792 | |
| parent | 7eed7c05fdb54e30976eb6599637786e2260f432 (diff) | |
| download | openembedded-core-f8b1fd4926f7dcba35d4e074225ba186b25e8f0d.tar.gz openembedded-core-f8b1fd4926f7dcba35d4e074225ba186b25e8f0d.tar.bz2 openembedded-core-f8b1fd4926f7dcba35d4e074225ba186b25e8f0d.zip | |
libx11/diet-x11: Fix /usr/include problem for keysymdef.h
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3398 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/xorg-lib/diet-x11/include_fix.patch | 62 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/diet-x11_1.1.2.bb | 4 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11_1.1.2.bb | 6 |
3 files changed, 67 insertions, 5 deletions
diff --git a/meta/packages/xorg-lib/diet-x11/include_fix.patch b/meta/packages/xorg-lib/diet-x11/include_fix.patch new file mode 100644 index 0000000000..565308834e --- /dev/null +++ b/meta/packages/xorg-lib/diet-x11/include_fix.patch @@ -0,0 +1,62 @@ +--- + configure.ac | 44 ++++++++++++++++++++++++-------------------- + 1 file changed, 24 insertions(+), 20 deletions(-) + +Index: libX11-1.1.2/configure.ac +=================================================================== +--- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000 ++++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000 +@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, + # + KEYSYMDEF="" + AC_MSG_CHECKING([keysymdef.h]) +-for flag in $XPROTO_CFLAGS -I/usr/include; do +- case "$KEYSYMDEF" in +- "") +- case "$flag" in +- *-I*) +- dir=`echo "$flag" | sed 's/ *-I//'` +- file="$dir/X11/keysymdef.h" +- if test -f "$file"; then +- KEYSYMDEF="$file" +- fi ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") ++ ++if test x$KEYSYMDEF = x; then ++ for flag in $XPROTO_CFLAGS -I/usr/include; do ++ case "$KEYSYMDEF" in ++ "") ++ case "$flag" in ++ *-I*) ++ dir=`echo "$flag" | sed 's/ *-I//'` ++ file="$dir/X11/keysymdef.h" ++ if test -f "$file"; then ++ KEYSYMDEF="$file" ++ fi ++ ;; ++ esac + ;; + esac +- ;; +- esac +-done +-case "$KEYSYMDEF" in +-"") +- AC_MSG_ERROR([Cannot find keysymdef.h]) +- ;; +-*) ++ done ++fi ++ ++if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) +- ;; +-esac ++else ++ AC_MSG_ERROR([Cannot find keysymdef.h]) ++fi + AC_SUBST(KEYSYMDEF) + + AC_ARG_ENABLE(udc, diff --git a/meta/packages/xorg-lib/diet-x11_1.1.2.bb b/meta/packages/xorg-lib/diet-x11_1.1.2.bb index f032987b88..9f1e877ab8 100644 --- a/meta/packages/xorg-lib/diet-x11_1.1.2.bb +++ b/meta/packages/xorg-lib/diet-x11_1.1.2.bb @@ -1,8 +1,8 @@ require libx11_${PV}.bb SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ - file://fix-disable-xlocale.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ file://fix-utf8-wrong-define.patch;patch=1" -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb index 93ad71f466..a4400ae88e 100644 --- a/meta/packages/xorg-lib/libx11_1.1.2.bb +++ b/meta/packages/xorg-lib/libx11_1.1.2.bb @@ -5,12 +5,12 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" -PR = "r2" +PR = "r3" XORG_PN = "libX11" -SRC_URI += "file://x11_disable_makekeys.patch;patch=1" - +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://include_fix.patch;patch=1" EXTRA_OECONF += "--without-xcb" |