On Mon, Jan 11, 2010 at 08:54:59AM +0100, Stephan Raue wrote: > Hi Peter, Dan, > > do you dont forgot this also to commit before release?
Dan, this patch doesn't seem to be in master yet. were you waiting for me to merge it? Cheers, Peter > > Am 21.12.2009 00:00, schrieb Peter Hutterer: > >On Sun, Dec 20, 2009 at 11:58:08AM -0800, Dan Nicholson wrote: > >>On Sun, Dec 20, 2009 at 11:24 AM, Stephan Raue<[email protected]> > >>wrote: > >>>Zitat von Dan Nicholson<[email protected]>: > >>> > >>>>On Sun, Dec 20, 2009 at 5:19 AM, Stephan Raue<[email protected]> > >>>>wrote: > >>>>>Hi all, > >>>>> > >>>>>when i am crosscompiling xorg-server i get an error from configure: > >>>>>checking for /etc/X11/fontpath.d... configure: error: cannot check for > >>>>>file existence when cross compiling > >>>>> > >>>>>is it possible to make this easyer for crosscompiling without patching > >>>>>configure.ac and configure in an release? > >>>>That's just the way AC_CHECK_FILE works. Since you're cross-compiling, > >>>>it doesn't think it's appropriate to check for files on the build > >>>>system to determine behavior. It continues, right? It should just give > >>>>you the fallback behavior. If you want to specify the fontpath, use > >>>>--with-default-font-path. > >>>no it doesnt continue, and i have already set --with-default-font-path ... > >>It looks like there's multiple issues with this approach, but the > >>attached should fix the cross compiling problem. We also need to > >>address the fact the file test won't resolve all the way when > >>$sysconfdir is not specified on the command line. E.g., > >>sysconfdir=${prefix}/etc by default, and then test -r > >>"${sysconfdir}/X11/fontpath.d" fails: > >> > >>checking for ${prefix}/etc/X11/fontpath.d... no > >> > >>-- > >>Dan > >> From fb76047a38eb1a5ce44ecbb68fd8206a60b7af7c Mon Sep 17 00:00:00 2001 > >>From: Dan Nicholson<[email protected]> > >>Date: Sun, 20 Dec 2009 11:50:25 -0800 > >>Subject: [PATCH] Don't use AC_CHECK_FILE for fontpath checks when cross > >>compiling > >> > >>AC_CHECK_FILE chokes when cross compiling, so instead we set the default > >>to the standard FONTROOTDIR directories in that case. > >> > >>Signed-off-by: Dan Nicholson<[email protected]> > >>--- > >> configure.ac | 21 ++++++++++++--------- > >> 1 files changed, 12 insertions(+), 9 deletions(-) > >> > >>diff --git a/configure.ac b/configure.ac > >>index 6cdef15..6e7c214 100644 > >>--- a/configure.ac > >>+++ b/configure.ac > >>@@ -503,18 +503,21 @@ XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi) > >> XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi) > >> > >> dnl Uses --default-font-path if set, otherwise checks for > >> /etc/X11/fontpath.d, > >>-dnl otherwise uses standard subdirectories of FONTROOTDIR > >>-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], > >>- [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'], > >>- [ > >>- > >>DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" > >>- case $host_os in > >>- darwin*) > >>DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" > >> ;; > >>- esac > >>- ]) > >>+dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross > >>+dnl compiling, assume default font path uses standard FONTROOTDIR > >>directories. > >>+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" > >>+if test "$cross_compiling" != yes; then > >>+ AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], > >>+ [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'], > >>+ [case $host_os in > >>+ darwin*) > >>DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" > >> ;; > >>+ esac]) > >>+fi > >> AC_ARG_WITH(default-font-path, > >> AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of > >> font dirs]), > >> [ FONTPATH="$withval" ], > >> [ FONTPATH="${DEFAULT_FONT_PATH}" ]) > >>+AC_MSG_CHECKING([for default font path]) > >>+AC_MSG_RESULT([$FONTPATH]) > >> > >> AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], > >> [Path to XKB base dir (default: ${datadir}/X11/xkb)]), > >> [ XKBPATH="$withval" ], > >>-- > >>1.6.2.5 > >> > >Reviewed-by: Peter Hutterer<[email protected]> > > > >Cheers, > > Peter > > > _______________________________________________ xorg mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/xorg
