diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch index 2341e40bca..2f98bb8c89 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch | |||
| @@ -1,19 +1,22 @@ | |||
| 1 | Index: xorg-server-1.7.99.2/configure.ac | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | =================================================================== | 2 | |
| 3 | --- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 | 3 | diff --git a/configure.ac b/configure.ac |
| 4 | +++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000 | 4 | index b3b752c..600500b 100644 |
| 5 | @@ -503,14 +503,10 @@ | 5 | --- a/configure.ac |
| 6 | 6 | +++ b/configure.ac | |
| 7 | dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, | 7 | @@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, |
| 8 | dnl otherwise uses standard subdirectories of FONTROOTDIR | 8 | dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross |
| 9 | -AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], | 9 | dnl compiling, assume default font path uses standard FONTROOTDIR directories. |
| 10 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], | 10 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" |
| 11 | - [ | 11 | -if test "$cross_compiling" != yes; then |
| 12 | DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" | 12 | - AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], |
| 13 | case $host_os in | 13 | - [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], |
| 14 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; | 14 | - [case $host_os in |
| 15 | esac | 15 | + case $host_os in |
| 16 | - ]) | 16 | darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; |
| 17 | - esac]) | ||
| 18 | -fi | ||
| 19 | + esac | ||
| 17 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), | 20 | AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), |
| 18 | [ FONTPATH="$withval" ], | 21 | [ FONTPATH="$withval" ], |
| 19 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) | 22 | [ FONTPATH="${DEFAULT_FONT_PATH}" ]) |