summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-07 17:07:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:35 +0100
commit4c80e07e6ca8d1ad13938067c66dd0801da90fb6 (patch)
treebf2cbe55043cbebb8a12f553d3e68681cb3c6b83 /meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
parent4981c2a793f8682fb676b427ed7e91254bddae92 (diff)
downloadpoky-4c80e07e6ca8d1ad13938067c66dd0801da90fb6.tar.gz
xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1 because in .inc we don't have ${PV} expanded yet * crosscompile.patch macro_tweak.patch were identical * fix_open_max_preprocessor_error.patch has only different header # $ diff xserver-xorg/fix_open_max_preprocessor_error.patch xserver-xorg-dri/fix_open_max_preprocessor_error.patch 1c1 < Upstream-Status: Pending --- > Upstream-Status: Inappropriate [embedded specific] (From OE-Core rev: aaa137f54c246b61a94b62a731de67f09e688a2a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
new file mode 100644
index 0000000000..2f98bb8c89
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
@@ -0,0 +1,22 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff --git a/configure.ac b/configure.ac
4index b3b752c..600500b 100644
5--- a/configure.ac
6+++ b/configure.ac
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. When cross
9 dnl compiling, assume default font path uses standard FONTROOTDIR directories.
10 DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
11-if test "$cross_compiling" != yes; then
12- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
13- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
14- [case $host_os in
15+ case $host_os in
16 darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
17- esac])
18-fi
19+ esac
20 AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
21 [ FONTPATH="$withval" ],
22 [ FONTPATH="${DEFAULT_FONT_PATH}" ])