diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-08 00:03:49 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-08 00:03:49 +0200 |
| commit | 2f81dd315f40a948e4f591fd9c8ece67b1866ac5 (patch) | |
| tree | 47dbda4c349980cf2b8a7b62b2160bf10532f93b /package/x11r7/xlib_libX11 | |
| parent | 6f4939d4c5624681bd7c0cbb92462f3d3fb941c3 (diff) | |
| parent | e3963e90cc84df3a31b68768831fe07a0003e322 (diff) | |
| download | buildroot-novena-2f81dd315f40a948e4f591fd9c8ece67b1866ac5.tar.gz buildroot-novena-2f81dd315f40a948e4f591fd9c8ece67b1866ac5.zip | |
Merge branch 'misc-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/x11r7/xlib_libX11')
| -rw-r--r-- | package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch new file mode 100644 index 000000000..9c4eae2b3 --- /dev/null +++ b/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch @@ -0,0 +1,35 @@ +[patch]: configure: add --with-keysymdef argument for cross compilation + +Based on a similar patch from Openembedded. + +The libX11 configure script hardcodes the location to keysymdef.h as +<prefix>/include/X11/keysymdef.h, which is fine for native compilation, +but breaks with cross compilation as that directory is a location on +the target, not the build host. + +Fix it by providing an explicit --with-keysymdef=<full-path-to-file>. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>Index: libX11-1.1.5/configure.ac +=================================================================== +Index: xlib_libX11-1.3.2/configure.ac +=================================================================== +--- xlib_libX11-1.3.2.orig/configure.ac 2009-10-23 22:55:03.000000000 +0200 ++++ xlib_libX11-1.3.2/configure.ac 2010-05-04 16:26:39.000000000 +0200 +@@ -280,8 +280,15 @@ + # 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 x$KEYSYMDEF = x; then ++ dir=`pkg-config --variable=includedir xproto` ++ KEYSYMDEF="$dir/X11/keysymdef.h" ++fi ++ + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else |