diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-03-05 23:39:08 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-03-05 23:39:08 +0000 |
| commit | 1dbb11bc87b9d153c6d75ac91d19cd5224d70ed7 (patch) | |
| tree | 25778b63a4ba3ec30c152dc1e6c7d740d9186976 | |
| parent | 64197d831371bd8450d65a9349be5ab55f366f59 (diff) | |
libx11 (all) add patch fixing bogus usage of pkgconfig to look for a header file (from Poky)
| -rw-r--r-- | packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch | 62 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11_1.1.1.bb | 9 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11_1.1.2.bb | 8 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11_1.1.3.bb | 8 |
4 files changed, 80 insertions, 7 deletions
diff --git a/packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch b/packages/xorg-lib/libx11/fix-searching-for-keysymdef.patch new file mode 100644 index 0000000000..565308834e --- /dev/null +++ b/packages/xorg-lib/libx11/fix-searching-for-keysymdef.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/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 5b1e304d51..41497fc873 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,6 +1,6 @@ require xorg-lib-common.inc PE = "1" -PR = "r5" +PR = "r6" DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ @@ -9,9 +9,12 @@ PROVIDES = "virtual/libx11" XORG_PN = "libX11" -EXTRA_OECONF += "--without-xcb" +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" -SRC_URI += " file://ruutf8.patch;patch=1" +SRC_URI += "\ + file://ruutf8.patch;patch=1 \ + file://fix-searching-for-keysymdef.patch;patch=1 \ +" do_compile() { ( diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb index e6b0ec5d8b..97cc8d4bfb 100644 --- a/packages/xorg-lib/libx11_1.1.2.bb +++ b/packages/xorg-lib/libx11_1.1.2.bb @@ -5,11 +5,15 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" -PR = "r1" +PR = "r2" XORG_PN = "libX11" -EXTRA_OECONF += "--without-xcb" +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +SRC_URI += "\ + file://fix-searching-for-keysymdef.patch;patch=1 \ +" do_compile() { ( diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb index 4035c77cdc..f46a2b6415 100644 --- a/packages/xorg-lib/libx11_1.1.3.bb +++ b/packages/xorg-lib/libx11_1.1.3.bb @@ -5,11 +5,15 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" -PR = "r0" +PR = "r1" XORG_PN = "libX11" -EXTRA_OECONF += "--without-xcb" +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +SRC_URI += "\ + file://fix-searching-for-keysymdef.patch;patch=1 \ +" do_compile() { ( |